vmario/doodle3d-firmware
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-firmware.git synced 2024-06-29 12:41:22 +02:00
Code Issues Releases Wiki Activity
295 Commits 12 Branches 38 Tags 818 KiB
11f8364e6e
Commit Graph

266 Commits

Author SHA1 Message Date
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
b6c983f446 wget return values are now translated to a (somewhat) meaningful message. 
Improved logging.
 2013-10-19 04:23:14 +02:00
Wouter R
e1dc7f47ed Add preliminary REST api for updating (WIP). 2013-10-18 21:46:41 +02:00
peteruithoven
15aa89844e client submodule update 2013-10-18 19:35:48 +02:00
peteruithoven
f5030d9069 client submodule update 2013-10-18 16:16:15 +02:00
peteruithoven
4738f8bde1 spelling corrections 2013-10-18 16:16:05 +02:00
peteruithoven
d64fea4337 Using {printingTemp} and {preheatTemp} in default start and end gcode 2013-10-18 16:15:54 +02:00
Wouter R
b5d980c52e More work on updater module (WIP): mainly added state and fixed bugs. 2013-10-18 16:02:22 +02:00
peteruithoven
b5465a43fd return substituted ssid on save settings response 2013-10-18 12:57:28 +02:00
Wouter R
6225cd6062 New wifibox update script (to update firmware image). (WIP) 
Release script is now capable of uploading packages & images.
 2013-10-17 21:45:23 +02:00
peteruithoven
e87641d76a client submodule update 2013-10-17 15:29:10 +02:00
peteruithoven
72678ef1cc Access point key validation function and handling validation function messages in general 2013-10-17 15:28:57 +02:00
peteruithoven
a85528e956 More helpfull validation errors 2013-10-17 14:04:13 +02:00
peteruithoven
cd6754bfe1 Added access point min max 2013-10-17 14:03:30 +02:00
peteruithoven
1425d5ef90 More network logging 2013-10-17 12:08:03 +02:00
peteruithoven
f4babb5c20 More API:network/openap logs 2013-10-16 20:32:31 +02:00
peteruithoven
94bcea894e Longer delay for access point create stability 2013-10-16 20:32:31 +02:00
Wouter R
cf7237547f Merge branch 'feature/printerdriver' of github.com:Doodle3D/doodle3d-firmware into feature/printerdriver 2013-10-16 19:04:43 +02:00
peteruithoven
aeb29d488e Client submodule update 2013-10-16 18:33:18 +02:00
Wouter R
b5d8f7895a Rework feed creation scripts: they now support uploading to doodle3d.com (with corresponding changes to opkg.conf) and they are more location independent. 2013-10-16 17:32:43 +02:00
peteruithoven
2010c634c6 Signin timeout and num attempts limitation 2013-10-16 17:16:01 +02:00
peteruithoven
da020cd51e client submodule update 2013-10-16 15:10:23 +02:00
peteruithoven
227ab3d7b8 client submodule update 2013-10-16 12:48:03 +02:00
Wouter R
17c96b20fd Submodule update. 2013-10-14 19:35:58 +02:00
Wouter R
ba09807859 Disable log message in createPrinterOrFail. 2013-10-14 18:11:15 +02:00
peteruithoven
6dae2054c5 client submodule update 2013-10-14 17:51:05 +02:00
Wouter R
9d86ed2aac Add option to create protected access point. 2013-10-14 14:01:22 +02:00
peteruithoven
369866ce60 client submodule update 2013-10-14 13:53:07 +02:00
peteruithoven
1ac2f204fe client submodule update 2013-10-12 13:10:16 +02:00
peteruithoven
39822d0fde client submodule update 2013-10-11 18:03:19 +02:00
peteruithoven
589ac4edac client submodule update 2013-10-11 17:08:22 +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
7060f864aa small fix logs 2013-10-10 13:04:14 +02:00
peteruithoven
164057a40a client submodule update 2013-10-10 12:22:30 +02:00
peteruithoven
d49b1bbd94 better network connect feedback 
control access managment
start of api:info/status
 2013-10-10 12:11:21 +02:00
Wouter R
8991845427 Add extra 'tools' to wifibox devel install. Improve logging. 2013-10-08 16:55:50 +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
0d0bfccb92 Client submodule update 2013-10-02 17:23:04 +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
e7db73a09b signing returns success boolean 2013-10-02 14:41:15 +02:00
peteruithoven
aab27a9768 less logging 2013-10-01 12:36:51 +02:00
peteruithoven
6a4879c7b2 added localip to /d3dapi/network/status (centralized captureCommandOutput and getLocalIP) 2013-09-30 18:08:02 +02:00
peteruithoven
d5a2c2cad9 client submodule update 2013-09-27 18:39:24 +02:00
peteruithoven
b042be5405 Signin every hour 2013-09-27 18:39:24 +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
ba47733dad Merge branch 'master' into printerdriver 
Conflicts:
	src/conf_defaults.lua
 2013-09-25 12:06:28 +02:00
Wouter R
2e43ae9897 Continued adaptation of printer api. 2013-09-25 12:00:50 +02:00
peteruithoven
1bcd46b18e query parsing fix 2013-09-23 18:42:00 +02:00
Wouter R
c5fd097b79 Replace URL decoder with a simpler implementation. 2013-09-20 23:38:20 +02:00
Wouter R
d7dc69a7dd Continued adaptation of printer api. 2013-09-20 11:30:36 +02:00
peteruithoven
e1bdd9bcc7 client submodule update 2013-09-19 00:24:37 +02:00
peteruithoven
3af2fa71de Nicer ssid, Changed default start gcode (removing -100 -100 starting point) 2013-09-18 21:16:54 +02:00
peteruithoven
a1e19bd4e8 Better default for maxObjectHeight 2013-09-18 12:13:07 +02:00
Wouter R
8a7162330b Initial API replacement to use new printer driver (limited functionality). 2013-09-17 00:14:42 +02:00
peteruithoven
c1fa030b97 client submodule update 2013-09-13 16:07:44 +02:00
peteruithoven
dfbe7a8ef5 client submodule update 2013-09-06 14:15:04 +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
880e090cfe client submodule update 2013-09-02 18:17:22 +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
a732e4890f Client submodule update 2013-08-29 01:43:09 +02:00
peteruithoven
b2904d532e Added a validation function option to configuration. Added a number check 2013-08-29 01:40:51 +02:00
peteruithoven
e2b28900bf client submodule update 2013-08-28 18:34:41 +02:00
peteruithoven
077a0b6818 Supported printers and baudrate api call 2013-08-28 18:33:48 +02:00
peteruithoven
24b773bd6f Handling multiline settings. Added start and end gcode 2013-08-28 17:12:41 +02:00
peteruithoven
aeb669cc99 New configuration defaults 2013-08-28 14:29:13 +02:00
peteruithoven
4e124b74d5 Added missing setSuccess in config/all api 2013-08-28 14:18:06 +02:00
Wouter R
c915906395 Fix URL redirection in captive portal mode (also client submodule update); add stresstest script (WIP); add commented line in d3dapi wrapper to use strace. 2013-08-26 16:15:45 +02:00
Wouter R
6e61a6fdd2 Merge d3dapi changes; remove setportspeed (usbconnectiontester is a new repo); change Openwrt package category to 'Doodle3D'. 2013-08-26 10:46:36 +02:00
peteruithoven
c5b91a2416 Adding "cgi invocation" to log file 2013-08-23 16:39:12 +02:00
peteruithoven
6fded50293 client submodule update 2013-08-23 16:39:12 +02:00
Wouter R
57c342ff60 WIP to change setportspeed into serial usb connectivity testing utility. 2013-08-23 16:24:36 +02:00
Wouter R
f7dc891c97 Logger now flushes buffer to have log file update immediately. 2013-08-23 10:43:42 +02:00
Wouter R
1d9801b314 Remove openap hack from uci-defaults; minor fixes to bootstrap logging etc; remove debug print statement. 2013-08-23 02:10:25 +02:00
Wouter R
3de992c5b7 Add uhttpd configuration for lua handler; add interface to get/set 'system settings'; add configurable logging to file, with configurable level as well. 2013-08-23 01:25:09 +02:00
Wouter R
0730b442ac Finish autowifi function. 2013-08-22 18:29:08 +02:00
Wouter R
dc327ea420 Adapt Lua code so it can be run from uhttpd-mod-lua (log functionality still missing, uhttpd configuration not adapted yet). 2013-08-22 12:18:22 +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
d59d2da938 Fix request initialization to handle autowifi command-line invocation correctly; fix installation and execution of openwrt init script; partially implement autowifi switching; fixes to package (de-)installation. 2013-08-21 13:39:10 +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
68f72565fe client submodule update 2013-08-20 10:55:36 +02:00
peteruithoven
659315a2c8 Adding new line to warmup command, to be sure 2013-08-20 10:53:56 +02:00
peteruithoven
6c5ffa8e01 Client submodule update 2013-08-19 17:55:48 +02:00
peteruithoven
059227ce86 client submodule update 2013-08-19 16:54:25 +02:00
peteruithoven
fae01fdf5b Client submodule update 2013-08-19 10:17:11 +02:00
peteruithoven
f21aefbc03 Client submodule update 2013-08-16 22:30:27 +02:00
Wouter R
da0862d2f9 Merge branch 'master' of github.com:Doodle3D/doodle3d-firmware 2013-08-16 22:10:00 +02:00
Wouter R
56f6815bc1 Minor fixes. 2013-08-16 21:44:54 +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
2538db8d0b Client submodule update 2013-08-16 19:31:03 +02:00
peteruithoven
9ae54ecd8d using file size instead of file to check isBusy 2013-08-16 19:26:23 +02:00
peteruithoven
2261efcb74 Client (submodule) update 2013-08-14 20:56:38 +02:00
Wouter R
0d7e215f20 Merge branch 'master' of github.com:Doodle3D/doodle3d-firmware 2013-08-13 20:04:04 +02:00
peteruithoven
a7e2ecaef0 submodule update 2013-08-12 21:55:22 +02:00
peteruithoven
d40619e082 Submodule update 2013-08-12 17:54:33 +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
31a8aab7ec Updated client submodule 2013-08-12 13:38:56 +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
peteruithoven
4239044c54 Allow access from all domains (not really secure) 2013-08-07 11:15:55 +02:00
Wouter R
77723fb000 Support print cancellation in api (untested!) 2013-08-04 11:26:47 +02:00
Wouter R
973b81f2cb Add configurable temperature. 2013-08-02 14:05:34 +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
3bc22c19fe Update web client to send gcode for printing. 2013-07-29 19:09:11 +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
Wouter R
6ee8b0193e Better response to invalid request method in rest api; fix creation of DHCP pool. 2013-07-29 12:21:08 +02:00
Wouter R
1acb559a1b Update webinterface to latest commit; add wopkg alias to root profile. 2013-07-29 12:17:08 +02:00
Wouter R
07ca14e35c Add doxify.sh to generate HTML code documentation using ldoc; update documentation in several utility files. 2013-07-29 12:07:23 +02:00
Wouter R
827affd4e4 Remove old www files. 2013-07-27 02:44:12 +02:00
Wouter R
5746d244d7 Repository cleanup. 2013-07-27 02:39:45 +02:00
Wouter R
efaf58c880 Fix outdated configuration key names; add API function to get all configuration keys at once; remove logging of request arguments to prevent printing large blocks of gcode. 2013-07-27 00:25:43 +02:00
Wouter R
0f4b938444 preliminary printing support (through ultifi). 2013-07-27 00:22:55 +02:00
Wouter R
9d6992ce95 Add configuration keys for printing; rework configuration key naming. 2013-07-26 10:18:34 +02:00
Wouter R
596799472c Change package-directory script to include ultifi package; several fixes to package installation; rename wifibox init script. 2013-07-26 02:15:01 +02:00
Wouter R
781c3f9ff1 Add kmod-usb-serial-ftdi as package dependency for FTDI-based 3D printers; fix MAC address lookup; fix dhcp configuration when switching to AP mode; rename api functions in network module; minor fixes and changes. 2013-07-25 01:11:46 +02:00
Wouter R
d4b9c39d60 Split debug flags into DEBUG_PCALLS and DEBUG_API; fix more quotation style and import naming. 2013-07-24 18:49:07 +02:00
Wouter R
9fd13dda65 Add small c program to test settings arbitrary baud rates. 2013-07-24 16:38:21 +02:00
Wouter R
243655b634 First steps towards package update support (current+available versions can be requested). 2013-07-24 16:36:27 +02:00
Wouter R
258770675e Fix quoting style in response.lua, add fucntion to set HTTP content type. 2013-07-24 16:30:23 +02:00
Wouter R
f988c13dfa Many changes, mostly a new configuration interface: 
* change API access control to use function name suffixes
* implement settings interface with baseline configuration
* make AP properties configurable
* AP SSID can now contain partial MAC address
* update more quotation style and documentation
* remove captive directory change from network mode switcher.
 2013-07-17 23:01:01 +02:00
Wouter R
d3e4812cbf Implement settings interface. 2013-07-17 17:43:33 +02:00
Wouter R
9a8ac55b8f Add simple unit test framework and various other improvements/changes: 
* Move logger.lua;
* update quotation style in several files;
* add proposed configuration key layout to conf_defaults.lua;
* move dump function to utils.lua;
* implement (very) basic unit testing environment;
* fix bugs in various functions in utils.lua;
* checkin of preliminary REST API test code.
 2013-07-17 13:44:54 +02:00
Wouter R
3726063b99 Change split function so it also returns empty fields; add API access control; support returning http status codes; changes towards support for running as uhttp embedded lua module. 2013-07-17 08:18:47 +02:00
Wouter R
9dd2928755 Change REST API to obtain module/function arguments from URL path; move several network settings to config.h. 2013-07-11 10:39:49 +02:00
Wouter R
1ac3f130ff Fix response sending when init() fails; create config.lua to contain global configuration; improve API function resolution; improve API code structure. 2013-07-10 01:23:16 +02:00
Wouter R
6caa7d244e Move request handling to request object; update and combine todo items to TODO.md; improve test api. 2013-07-09 01:56:21 +02:00
Wouter R
4847b59378 Update TODO 2013-07-08 21:45:21 +02:00
Wouter R
e2127797de Fix problem where 'wlan0' device disappears (code now falls back to 'radio0'); fix symlink path for captive portal www; minor fixes. 2013-07-08 19:02:20 +02:00
Wouter R
b861f43e11 Fix wlan state information (and add a number of extra fields). 2013-07-08 18:12:05 +02:00
Wouter R
115e6a7eff Refactor all code to new API; several minor changes/bug fixes. 2013-07-08 16:53:45 +02:00
Wouter R
915d1cd900 Move and clean up utils.lua. 2013-07-08 13:43:59 +02:00
Wouter R
ea8100ab60 Logging now prints to stderr, which is redirected to a log file; cgi handler always responds with json; test API implemented; several bug fixes. 2013-07-08 13:37:19 +02:00
peteruithoven
9f8d788adc Added client submodule 2013-07-05 19:31:45 +02:00
peteruithoven
166dbc582b Moved moved www experiment code away for new client submodule 2013-07-05 19:26:04 +02:00
Wouter R
c0b06a77fb Create base files in rest subdirectory. 2013-07-05 17:26:39 +02:00
Wouter R
ef87b18ed9 More fixes to changed paths and names. 2013-07-05 16:44:49 +02:00