0
0
mirror of https://github.com/Doodle3D/doodle3d-firmware.git synced 2024-07-01 05:31:23 +02:00
Commit Graph

164 Commits

Author SHA1 Message Date
Wouter R
5f59e5e2c9 Add logging module/facility support.
Change log message format to match with that in print3d logger.
2016-01-08 14:52:39 +01:00
Wouter R
2459cda0ac Reorder and rename log levels to match those in print server.
Fix typo in regex in getLocalIp function.

Conflicts:
	src/script/wifibox.uci.config
2016-01-08 13:48:24 +01:00
Rick Companje
b840938cbc updated release notes and sketch api 2014-12-19 16:10:42 +01:00
peteruithoven
6e6dd1a108 API availability comments 2014-05-14 16:59:47 +02:00
peteruithoven
2669ca2135 Added api availability comment 2014-05-14 16:52:18 +02:00
peteruithoven
e4b2e605ed Removed network configuration boot mode and starting wifibox init after uhttpd and dnsmasq 2014-03-12 18:23:10 +01:00
peteruithoven
09f653e3da Fixed issue that control access wasn't properly reset after print 2014-03-12 16:36:16 +01:00
Wouter R
0b6de9adba Return "connecting" state if printer is connected but server has not started yet; other calls will fail just like if no printer exists. 2014-03-09 02:12:36 +01:00
Wouter R
b6a3426b07 Merge branch 'develop' of github.com:Doodle3D/doodle3d-firmware into develop
Conflicts:
	src/rest/api/api_info.lua
2014-03-05 17:53:43 +01:00
Wouter R
4a76f022e0 Modification for connecting state of printer. 2014-03-05 17:52:46 +01:00
peteruithoven
89cec5c989 Added substituted wifiboxid to d3dapi/config post response 2014-02-28 11:11:16 +01:00
peteruithoven
5ee34873c3 wifiboxid (substituted) available under d3dapi/info 2014-02-28 11:05:23 +01:00
peteruithoven
c0a3747d00 api/info/status cleanup 2014-02-28 11:05:22 +01:00
Wouter R
9f50ec73b3 Merge branch 'develop' of github.com:Doodle3D/doodle3d-firmware into develop 2014-02-28 09:47:30 +01:00
Wouter R
ef296218a2 Change update site URL to be a setting.
Show release date in command-line info.
Remove development path from updater script.
2014-02-25 23:57:37 +01:00
Wouter R
a5f0492a13 Identify beta->stable transition as 'update' when includeBetas setting is false.
Fix in index generator in update publisher.
2014-02-24 22:59:38 +01:00
peteruithoven
19892f0917 Removed debug ssid retrieval from info/alive 2014-02-24 15:33:58 +01:00
peteruithoven
39b5b756ec Removed legacy v property from info/status 2014-02-24 15:31:04 +01:00
Wouter R
524ef027f5 Add a number of sanity checks to release script.
Tidying up.
Several changes and fixes to beta updating code.
2014-02-24 15:22:08 +01:00
Wouter R
8582f88e06 Extend updater and API to support betas and release dates (untested). 2014-02-21 11:15:36 +01:00
peteruithoven
c0901747b3 Don't switch to ap mode when updating 2014-01-10 12:23:32 +01:00
peteruithoven
c621c618bd Start access point network services on boot instead of reload 2014-01-10 11:14:17 +01:00
peteruithoven
cdcd76654a Small cleanup 2014-01-08 14:50:52 +01:00
peteruithoven
e056e4e936 Properly handling API:update/install no_retain argument 2013-12-23 23:24:31 +01:00
Wouter R
0a51cee8c9 Avoid unnecessary UCI commits, speeding up the process of setting all keys at once considerably. 2013-12-23 18:05:48 +01:00
peteruithoven
e79902feeb Log noRetain argument in API:update/install 2013-12-23 17:36:57 +01:00
Wouter R
1fe9da5985 Minor changes to UCI error handling. 2013-12-23 15:33:55 +01:00
peteruithoven
8fda75664c Merge branch 'develop' of https://github.com/Doodle3D/doodle3d-firmware into develop
Conflicts:
	src/rest/api/api_config.lua
2013-12-23 14:47:51 +01:00
peteruithoven
bd1409b6a6 Better uci error handling 2013-12-23 14:35:03 +01:00
Wouter R
d254beb1ab Do not generate error when printer device exists without accompanying server. Fixes https://github.com/Doodle3D/doodle3d-client/issues/139. 2013-12-20 17:11:58 +01:00
Wouter R
fc9460fc82 Add license header to source files. 2013-12-20 16:29:46 +01:00
Wouter R
ec79cb7c7a Merge branch 'develop' of github.com:Doodle3D/doodle3d-firmware into develop 2013-12-06 15:07:05 +01:00
Rick Companje
34491670b8 added printer/listall to API 2013-12-05 17:31:44 +01:00
Wouter R
c33cc73b85 Add option to update/install to not retain any files in flash memory. 2013-12-04 17:40:43 +01:00
peteruithoven
4de647c9c7 Merge branch 'develop' of https://github.com/Doodle3D/doodle3d-firmware into develop 2013-12-04 14:21:50 +01:00
Rick Companje
051e70a32b Merge branch 'master' into develop 2013-12-04 14:17:00 +01:00
Rick Companje
7da2b05af8 fixed SKETCH_FILE_EXTENSION bug (solves Sketch Load & Save problem) 2013-12-04 14:13:39 +01:00
Wouter R
25c0c1a1fa Amend last commit. 2013-11-29 20:47:17 +01:00
Wouter R
042f33c11a Log all the things!
Closes #78 (on client: https://github.com/Doodle3D/doodle3d-client/issues/78).
Bump fimware version to 0.9.11 (to avoid accidentally overwriting previous image).
2013-11-29 20:37:03 +01:00
peteruithoven
462360712b comments 2013-11-29 13:12:31 +01:00
peteruithoven
c432325b89 Added specific API:config/reset endpoint 2013-11-29 13:00:09 +01:00
peteruithoven
d9afb1159e API:config/resetall 2013-11-22 18:05:51 +01:00
peteruithoven
f246252e53 Goto access point mode before update 2013-10-30 21:20:45 +01:00
Wouter R
90439649ab Add symlink to sketch directory in www directory.
Bump image version.
Change sketch extension to svg.
Default printer type to 'ultimaker'.
2013-10-30 20:36:18 +01:00
peteruithoven
92628c660f Removing endcode variables comment 2013-10-30 15:29:46 +01:00
Wouter R
0f59eb30d6 Merge branch 'feature/printerdriver' of github.com:Doodle3D/doodle3d-firmware into feature/printerdriver 2013-10-29 12:28:35 +01:00
Wouter R
0c79a51083 Add status request to sketch api.
Keep sketch directory over upgrades.
2013-10-28 19:38:53 +01:00
peteruithoven
23d077c4ca API:printer/stop doesn't automatically send endcode, you have to specify it trough a gcode argument 2013-10-28 17:13:26 +01:00
peteruithoven
88a779e8bf Don't signin after saving settings (is done on client side) 2013-10-28 13:52:27 +01:00
peteruithoven
556b587059 Logging ssid to debug network connection issues 2013-10-26 01:31:06 +02:00
Wouter R
628f05b682 Deny API access to operations that can/will interrupt printing (updating, reconfiguring network, change settings). 2013-10-23 17:38:54 +02:00
peteruithoven
78a71ca625 Bed temperatures 2013-10-22 16:00:37 +02:00
peteruithoven
8ab87312b3 Replacing variables in endcode on API:printer/stop 2013-10-22 13:51:02 +02:00
peteruithoven
c3bb0359bf Better error reporting, always using state, making version argument optional 2013-10-22 03:30:27 +02:00
Wouter R
d069dafb5c New API for loading and saving sketches (or arbitrary data really). Status call not implemented yet. 2013-10-21 18:32:11 +02:00
Wouter R
5c199eca94 Merge branch 'feature/printerdriver' of github.com:Doodle3D/doodle3d-firmware into feature/printerdriver
Conflicts:
	src/network/netconfig.lua
2013-10-21 13:49:45 +02:00
Wouter R
581ea273b2 Fixes to update module and api. 2013-10-21 13:42:58 +02:00
Wouter R
b6528e4752 Basic implementation of update module + api finished (but not completely debugged yet). 2013-10-21 12:36:54 +02:00
Wouter R
e1dc7f47ed Add preliminary REST api for updating (WIP). 2013-10-18 21:46:41 +02:00
peteruithoven
b5465a43fd return substituted ssid on save settings response 2013-10-18 12:57:28 +02:00
peteruithoven
a85528e956 More helpfull validation errors 2013-10-17 14:04:13 +02:00
peteruithoven
a818dbcc55 API:printer/print changed argument last to start 2013-10-11 15:34:57 +02:00
peteruithoven
e0c4c81d75 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-firmware into feature/printerdriver
Conflicts:
	src/rest/api/api_info.lua
	src/rest/api/api_printer.lua
2013-10-10 17:55:35 +02:00
peteruithoven
0667dfe070 Handle errors in api:info/status. Use Disconnected state when there is no printer driver 2013-10-10 17:51:14 +02:00
Wouter R
43eaab4cbf Fix cleanup in info/logfiles api. 2013-10-10 17:17:23 +02:00
Wouter R
6e80ca8aa2 Merge branch 'feature/printerdriver' of github.com:Doodle3D/doodle3d-firmware into feature/printerdriver
Conflicts:
	src/rest/api/api_info.lua
2013-10-10 17:05:45 +02:00
Wouter R
0e8a08594a Update info/logfiles API call to collect print3d logs instead of ultifi logs. Change printer/getProgress to return current, buffered and total gcode lines. Remove unused constants from printer api. 2013-10-10 17:00:16 +02:00
peteruithoven
0956561064 API:info/status 2013-10-10 15:03:42 +02:00
peteruithoven
d49b1bbd94 better network connect feedback
control access managment
start of api:info/status
2013-10-10 12:11:21 +02:00
peteruithoven
37783f3f06 Fixed boot wifi connection issues by adding sleep 2013-10-04 16:29:53 +02:00
peteruithoven
d083ee70dd new server api url, returning signin response, alive api 2013-10-03 18:07:58 +02:00
peteruithoven
70d88fc036 Merge branch 'master' into feature/printerdriver 2013-10-02 15:17:08 +02:00
peteruithoven
9a2e8910f4 Added signin api call (mostly for debugging) 2013-10-02 14:42:27 +02:00
peteruithoven
8fc5273509 When settings are saved, firmware signs in (for changed wifiboxid) 2013-10-02 14:41:46 +02:00
peteruithoven
6a4879c7b2 added localip to /d3dapi/network/status (centralized captureCommandOutput and getLocalIP) 2013-09-30 18:08:02 +02:00
Wouter R
2f04bbb35d www submodule update to printerdriver branch; fix heatup config names. 2013-09-27 18:25:16 +02:00
Wouter R
2e43ae9897 Continued adaptation of printer api. 2013-09-25 12:00:50 +02:00
Wouter R
d7dc69a7dd Continued adaptation of printer api. 2013-09-20 11:30:36 +02:00
Wouter R
8a7162330b Initial API replacement to use new printer driver (limited functionality). 2013-09-17 00:14:42 +02:00
peteruithoven
524d41e39b Access point can now be made on start up and the activated network config is always moved to the top so it's picked on startup 2013-09-04 19:23:51 +02:00
peteruithoven
a341739336 Reenabling associate action 2013-09-02 18:05:02 +02:00
peteruithoven
3c59322cf7 First attempt to add a post response function queue 2013-09-02 15:01:16 +02:00
peteruithoven
077a0b6818 Supported printers and baudrate api call 2013-08-28 18:33:48 +02:00
peteruithoven
4e124b74d5 Added missing setSuccess in config/all api 2013-08-28 14:18:06 +02:00
Wouter R
0730b442ac Finish autowifi function. 2013-08-22 18:29:08 +02:00
Wouter R
dfb16a9b32 Fix logfile saving if ultifi path does not exist; fix http response consistency. 2013-08-21 13:39:45 +02:00
Wouter R
6f431942cc Fix dhcp address serving in AP mode; small fix in printer API. 2013-08-20 21:53:36 +02:00
peteruithoven
659315a2c8 Adding new line to warmup command, to be sure 2013-08-20 10:53:56 +02:00
Wouter R
da0862d2f9 Merge branch 'master' of github.com:Doodle3D/doodle3d-firmware 2013-08-16 22:10:00 +02:00
Wouter R
72afef93bd Add d3dapi/info/logfiles API call to obtain a tgz file containing the most important log data. 2013-08-16 20:03:53 +02:00
peteruithoven
9ae54ecd8d using file size instead of file to check isBusy 2013-08-16 19:26:23 +02:00
Wouter R
016d18c93a Create combined gcode file in printer-specific directory; add mass-flashing script (WIP). 2013-08-12 17:36:07 +02:00
peteruithoven
633fc86551 Adding progress to rest api 2013-08-09 22:15:58 +02:00
peteruithoven
ba1ca3e322 less debug 2013-08-07 20:37:05 +02:00
peteruithoven
395ac53497 Fixed last_mod 2013-08-07 18:30:58 +02:00
peteruithoven
b8e0acb16b Supporting M109 temp format. Also returning last modified time using LuaFileSystem library. 2013-08-07 17:50:30 +02:00
Wouter R
77723fb000 Support print cancellation in api (untested!) 2013-08-04 11:26:47 +02:00
Wouter R
b971be33d1 Fix post-install script for 'Y' inlusion in openwrt images; fix small bug in request.lua. 2013-08-01 16:29:17 +02:00
Wouter R
eddb7f7d0d Fixes to getMacAddress() and to adding gcode. 2013-07-29 19:22:09 +02:00
Wouter R
1608875891 Report failure if wlan associate fails; Fix setting/unsetting boolean config key through API. 2013-07-29 13:48:56 +02:00