vmario/doodle3d-firmware
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-firmware.git synced 2024-12-31 15:03:48 +01:00
Code Issues Releases Wiki Activity
280 Commits 12 Branches 38 Tags 832 KiB
468af0e604
Commit Graph

280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wouter R
1af6ad00cf Add license + copyright info on external software. 
Add script to add/replace license header in source files.
 2013-12-20 16:00:06 +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
7488c3a04c Merge branch 'feature/heatedbedcondition' into develop 2013-12-18 17:46:19 +01:00
peteruithoven
2a30cc2605 Added heatedbed setting and {if heatedBed} in default start- and endgcodes 2013-12-18 17:45:53 +01:00
Wouter R
486d4eb6ef Merge branch 'develop' of github.com:Doodle3D/doodle3d-firmware into develop 2013-12-18 13:30:52 +01:00
Wouter R
493728b3bb Update path to update directory on webserver. 2013-12-18 13:29:53 +01:00
peteruithoven
72d4e5c4c1 Version update 2013-12-18 13:29:47 +01:00
peteruithoven
50d535a986 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-firmware 2013-12-18 13:17:07 +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
Wouter R
f5bf9c279d Include release notes as html in /www directory. 
Bump package version.
 2013-12-12 14:08:22 +01:00
peteruithoven
134c741018 Merge branch 'develop' 2013-12-12 14:08:06 +01:00
Wouter R
01e29b4b5a Release notes for 0.9.11. 2013-12-11 22:25:09 +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
0308ac4b5d Bump package version. 2013-12-06 15:10:07 +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
Wouter R
c4c9957cb5 Fix saving sketches over sysupgrade. Closes https://github.com/Doodle3D/doodle3d-client/issues/87. 2013-12-04 15:44:47 +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