vmario/doodle3d-firmware
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-firmware.git synced 2024-11-18 03:27:56 +01:00
Code Issues Releases Wiki Activity
354 Commits 12 Branches 38 Tags 818 KiB
experimental/webcam
Commit Graph

302 Commits

Author SHA1 Message Date
peteruithoven
cdcd76654a Small cleanup 2014-01-08 14:50:52 +01:00
peteruithoven
f50e752235 Using variables in makerbot start- and endgcode 2014-01-02 16:53:59 +01:00
peteruithoven
468af0e604 Merge branch 'develop' 
Conflicts:
	ReleaseNotes.md
	src/FIRMWARE-VERSION
	src/util/settings.lua
 2014-01-02 13:30:59 +01:00
peteruithoven
24ab7fa94e Version and ReleaseNotes 2013-12-23 23:25:06 +01:00
peteruithoven
e056e4e936 Properly handling API:update/install no_retain argument 2013-12-23 23:24:31 +01:00
peteruithoven
7de2e2aed0 Implemented noCommit optimization to reset and resetall 2013-12-23 20:27:32 +01:00
peteruithoven
b56a0ed1a9 Ignoring API:config/reset issues for now 2013-12-23 20:26:44 +01:00
peteruithoven
87a4c2a830 Small correction in log text 2013-12-23 18:06:32 +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
peteruithoven
1668cd446a Setting:tour enabled 2013-12-19 16:34:59 +01:00
peteruithoven
b72c56e76b Deltabot default start- and endgcode and dimentions 2013-12-19 14:37:11 +01:00
peteruithoven
75fd335311 Version update 2013-12-19 12:53:57 +01:00
peteruithoven
5c7b1dee10 When the status isn't "success" the status and the msg is now logged in wifibox.log. Fixing #140 2013-12-18 17:59:40 +01:00
peteruithoven
2a30cc2605 Added heatedbed setting and {if heatedBed} in default start- and endgcodes 2013-12-18 17:45:53 +01:00
peteruithoven
72d4e5c4c1 Version update 2013-12-18 13:29:47 +01:00
peteruithoven
68f169be70 Reset logic delete's all uci values and then reset them to the defaults 
(Allow setting value to value that is the default)
 2013-12-18 13:15:41 +01:00
peteruithoven
348c088cc9 Reset logic delete's all uci values and then reset them to the defaults 
(Allow setting value to value that is the default)
 2013-12-16 03:33:44 +01:00
peteruithoven
8dc3be6199 Log firmware version in wifibox.log 2013-12-13 14:23:31 +01:00
peteruithoven
021ec46e79 Don't log network password 2013-12-11 17:30:16 +01:00
peteruithoven
c69420b5b3 IE aggressively caches ajax calls, adding this header makes it behaivior consistent with other browsers 2013-12-11 16:57:44 +01:00
peteruithoven
5ccbf68362 Unsilencing network connection attempts 2013-12-09 21:15:02 +01:00
peteruithoven
f534b7cf91 Less config logging 2013-12-09 21:12:21 +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
peteruithoven
52a2d69bdd Added "Generated with Doodle3D (ultimaker2)" to default ultimaker2 start gcode 2013-12-05 16:50:37 +01:00
peteruithoven
29faf69457 Using default makerbot gcodes for replicator2x 2013-12-05 16:49:34 +01:00
peteruithoven
1e106da3d2 Added makerbot_replicator2x 2013-12-05 16:24:43 +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
7ee1d9b47a Remove an deprecated dependancy 2013-12-04 17:13:33 +01:00
peteruithoven
0e601baf2a Enabling traveling by default 2013-12-04 16:16:21 +01:00
peteruithoven
d1c2b08a1f Added Ultimaker2 specific default start and end gcode 2013-12-04 15:42:46 +01:00
peteruithoven
f9f34a42a7 Added Ultimaker2 2013-12-04 14:55:25 +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
peteruithoven
69d9d2add8 Merge branch 'feature/printerprofiles' into develop 2013-12-04 14:09:00 +01:00
Wouter R
ce043de28e Workaround for issue 66 (https://github.com/Doodle3D/doodle3d-client/issues/66). 
Remove ‘-s’ flag in wifibox init script to prevent duplicates log messages.
 2013-11-29 21:14:59 +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
e160f5b94f Updated api info url 2013-11-29 13:28:54 +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
b1bc8f5ded Reset now clears all sections except system 2013-11-29 12:59:51 +01:00
peteruithoven
33e58e5379 Easier subsection default system 2013-11-29 11:03:27 +01:00
peteruithoven
c23c8d9e7c Config subsection system, enabling printer profiles and even material profiles 2013-11-28 17:48:00 +01:00
Wouter R
dc8be7ca12 Merge branch 'master' into develop 2013-11-22 18:21:46 +01:00
peteruithoven
d9afb1159e API:config/resetall 2013-11-22 18:05:51 +01:00
Wouter R
8d7eecc539 Bump image version to 0.9.10. 2013-11-22 17:25:21 +01:00
Wouter R
48b9a4a8e1 Documentation. 
Untrack TODO.md.
 2013-11-08 18:54:57 +01:00
peteruithoven
6c15b2c220 Version 0.9.9 2013-11-07 16:49:20 +01:00
Wouter R
0e5726ee04 Documentation. 2013-11-05 01:46:32 +01:00
Wouter R
97564de8fc Add LDoc configuration and slightly extend doxify.sh. 
Add documentation in various places.
 2013-11-04 22:34:09 +01:00
peteruithoven
beb7f39471 Set signin status to idle after failed signin 2013-10-30 21:29:17 +01:00
peteruithoven
4279073fe0 version increase 2013-10-30 21:23:32 +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
6f05ea9ce0 Remove gpx building from makefiles. 2013-10-29 15:45:03 +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
peteruithoven
5a7a10066b Makerbot start- and endcode 2013-10-29 11:08:12 +01:00
Wouter R
de9570d166 Remove submodule gpx (can now be found in the print3d repository). 2013-10-28 21:06:31 +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
80dda36421 Skipping signin when already running 2013-10-28 13:51:56 +01:00
peteruithoven
f8825896d8 General status utility 2013-10-28 13:50:58 +01:00
peteruithoven
f2c630a911 Added start- and endcode for x3g (makerbot) 2013-10-28 00:58:14 +01:00
peteruithoven
6db142eeaa Bed size settings 2013-10-26 03:20:26 +02:00
peteruithoven
556b587059 Logging ssid to debug network connection issues 2013-10-26 01:31:06 +02:00
peteruithoven
3e8fe104c9 url encode wifiboxid for signin 2013-10-26 01:29:34 +02:00
peteruithoven
2d686d94d2 version 2013-10-26 01:28:24 +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
Wouter R
9e0eab1f8d Properly start and stop signin.sh on package installation and removal. 
Clean up package Makefile (it installed and removed too much).
 2013-10-22 22:44:51 +02:00
Wouter R
5c7df6da36 Merge branch 'feature/printerdriver' of github.com:Doodle3D/doodle3d-firmware into feature/printerdriver 2013-10-22 20:36:26 +02:00
Wouter R
4ed3c02ea3 Changes to use external doodle3d-client package instead of submodule. 2013-10-22 18:32:53 +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
6ddd038495 Bumped firmware version. 
Fixed image index generator to include all available image versions.
 2013-10-21 16:06:48 +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
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