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

403 Commits

Author SHA1 Message Date
peteruithoven
d032b85b61 Added Builder3D printers to supported printers 2014-05-22 15:15:54 +02:00
peteruithoven
6e6dd1a108 API availability comments 2014-05-14 16:59:47 +02:00
peteruithoven
d1e35c1a69 Fixed scan error handling issue
The getScanInfo could return a false, which wasn’t handled properly
resulting in a error and the box sticking into connecting mode.
2014-05-14 16:52:18 +02:00
peteruithoven
2669ca2135 Added api availability comment 2014-05-14 16:52:18 +02:00
Wouter R
ca25ab0487 Fix issue where autowifi would associate with ssid equal to locally known AP ssid. 2014-05-01 16:14:36 +02:00
peteruithoven
05b4f00a48 Merge branch 'develop' 2014-04-09 16:04:16 +02:00
peteruithoven
9f754876f0 Resolving conflict 2014-03-19 16:44:09 +01:00
peteruithoven
349210a3fc Merge branch 'develop' 2014-03-14 15:05:26 +01:00
peteruithoven
bba1b887b5 Version and ReleaseNotes update 2014-03-14 13:55:58 +01: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
peteruithoven
00340cb253 Not specifying bssid in wireless config and removing previous configs with same ssid 2014-02-27 15:14: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
8f6fc9dc99 Remove all wireless configs with ssid instead of only the first 2014-02-24 16:37:30 +01:00
peteruithoven
d5f2ec85d3 Check a few times if associating to network succeeded, otherwise fail 2014-02-24 16:33:51 +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
264511f809 Add support for beta releases to updater command-line tool.
Fix several bugs in updater.
Validate images both on file size and checksum.
2014-02-22 00:09:41 +01:00
Wouter R
96065095ab Integrate new release scripts with firmware.
Accept 'y' for an answer to sync question.
Add makeshift test file for later reference.
2014-02-21 11:33:42 +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
ce772010fb Merge branch 'develop'
Conflicts:
	ReleaseNotes.md
	extra/openwrt-build/openwrt-diffconfig-extramini
	extra/openwrt-build/openwrt-diffconfig-mini
	extra/openwrt-build/openwrt-diffconfig-regular
	src/FIRMWARE-VERSION
	src/conf_defaults.lua
2014-02-13 12:36:40 +01:00
peteruithoven
5a56780f89 Release notes and version update 2014-02-12 17:58:34 +01:00
peteruithoven
b026ed1874 Make heated bed optional for Ultimaker2 2014-02-12 12:35:55 +01:00
peteruithoven
daabffd1ca Use application/json for REST API 2014-01-31 15:41:53 +01:00
peteruithoven
11f8364e6e miniFactory support 2014-01-30 13:21:21 +01:00
peteruithoven
175f55f854 Allow floats for retraction amount setting 2014-01-27 13:39:30 +01:00
peteruithoven
75e0d7efd9 Removing display message from makerbot endgcode 2014-01-23 18:29:48 +01:00
peteruithoven
06e46bee65 Merge branch 'develop'
Conflicts:
ReleaseNotes.md
src/FIRMWARE-VERSION
2014-01-23 11:33:29 +01:00
peteruithoven
9d1f16d589 Version and release notes 2014-01-20 18:27:26 +01:00
peteruithoven
71326510e6 Using proper set target bed temperature gcode for makerbot in endgcode 2014-01-20 15:34:46 +01:00
peteruithoven
15f96c115b Start signing in loop after 15 min 2014-01-20 15:21:04 +01:00
peteruithoven
ac46c183ac Disable boot mode for access point 2014-01-20 15:06:57 +01:00
peteruithoven
60d07c9667 Make sure it keeps signing in. 2014-01-20 15:06:41 +01:00
Wouter R
ab900533f3 Improved makerbot gcode (based on Makerware start/end code). 2014-01-10 22:23:29 +01:00
Wouter R
165a6a5f8a Add setting for bottom layer flow rate factor.
Add setting for bottom layer speed.
2014-01-10 17:31:32 +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
39621b215f Small comments and log fixes 2014-01-10 11:13:26 +01:00
peteruithoven
4d782681df Implemented signin attempts system and signing response check 2014-01-09 21:11:49 +01:00
peteruithoven
8e34f338c2 More frequent signing (1 hour > 15 min) 2014-01-08 17:21:01 +01:00
peteruithoven
af00c17652 Make sure network services are started on boot, instead of just reloaded
(removed wireless_reload request)
2014-01-08 17:18:09 +01:00
peteruithoven
491e6021e9 Wait 1 second manually for the network association to finish 2014-01-08 14:50:53 +01:00
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