Commit Graph

123 Commits (master)

Author SHA1 Message Date
q3k 627aad1954 Merge branch 'master' of https://github.com/foosel/OctoPrint
Conflicts:
	octoprint/users.py
2013-10-06 02:11:17 +02:00
Gina Häußge 717ec0419f Changed SD filename generation, made SD handling more reliable as a whole 2013-09-23 17:59:22 +02:00
Gina Häußge 8ad20a0168 Allow definition of temperature offsets for extruder and bed
Session based temperature offsets that are only applied to temperature definitions in GCODE files being printed, in order to quickly experiment with temperature settings.

Closes #97
2013-09-08 17:49:01 +02:00
Gina Häußge 0471f1155e Timelapse configuration may now be saved
Persisted configuration will automatically be loaded upon startup. May be overridden by custom settings. Current timelapse configuration is visible in State box.

Closes #116
2013-09-08 15:41:26 +02:00
Gina Häußge 715dea7eb3 Merge branch 'repetier' into devel 2013-09-02 17:35:52 +02:00
Gina Häußge c9f97ef50d added optional attachment header to response of LargeResponseHandler, changed gcode and timelapse download to use direct URLs 2013-09-02 15:12:17 +02:00
Gina Häußge e5f43835f4 Let's try a modified request StaticFileHandler which processes 16K chunks of the file to return 2013-09-02 14:11:18 +02:00
Gina Häußge 928a8b3d9c Let tornado handle the file downloads 2013-09-02 13:18:45 +02:00
Gina Häußge 928cfd3950 Added content length header to streamed output 2013-09-01 19:28:15 +02:00
Gina Häußge 61481bf93f Stream gcode and timelapse files from disc 2013-09-01 18:12:30 +02:00
Gina Häußge 55cb991c44 Allow disabling of the temperature graph and gcode visualizer without any side effects
Also introduced feature parameter for the temperature graph

See #215
2013-08-29 21:16:35 +02:00
Gina Häußge fcbd5ba042 Merge branch 'devel' into repetier
Conflicts:
	octoprint/settings.py
2013-08-27 22:14:09 +02:00
Gina Häußge 46500cea7c Implemented configurable terminal filters 2013-08-27 21:31:12 +02:00
Gina Häußge dd19b69441 Replaced socket.io with SockJS 2013-08-26 17:37:13 +02:00
Gina Häußge d12da2548f New option "swallowOkAfterResend" for Repetier, changed initial linenumber for serial comm to 1 2013-08-26 14:44:31 +02:00
Gina Häußge 6ab8b76859 Allow more than one local network to be defined 2013-08-18 22:50:52 +02:00
Gina Häußge 2261ddf41f Properly enable serial logging on startup if configured 2013-08-18 18:40:08 +02:00
Gina Häußge 54175d2146 First throw at autologin capabilities 2013-08-18 18:33:21 +02:00
Gina Häußge f622e1e181 And a robots.txt for good measure... 2013-08-11 16:57:39 +02:00
Gina Häußge 4cf041aaad Enforces a new first-run setup wizard for access control to be run and forbids running OctoPrint as root unless a special command option is supplied
The dialog also informs about the risk of unauthorized strangers (mis)using the printer if an unsecured OctoPrint installation is made available on the internet.
2013-08-10 21:59:05 +02:00
Gina Häußge 31d86cd0a2 Added left space on filesystem holding the uploads folder to the gcode files list
Closes #186
2013-07-20 16:01:17 +02:00
Gina Häußge 22ea55746c Overall better gcode file handling
See #182 and https://groups.google.com/forum/#!topic/octoprint/YnOzyToxfkI
2013-07-13 16:30:41 +02:00
Gina Häußge 6e50d37e51 Fixed key error 2013-07-09 22:19:58 +02:00
Gina Häußge 8dcbb620bb Highlight currently selected file, disable deletion and load/loadAndPrint for it
Fixed #182
2013-07-07 23:27:22 +02:00
Gina Häußge 6d3e3221b8 Added timeout settings for serial communiction, initial connection and baudrate detection
Closes #126
2013-07-04 21:26:53 +02:00
Gina Häußge 44f1f01001 Allow enabling of serial logging at runtime 2013-06-30 22:18:29 +02:00
Gina Häußge 42f2398ac1 Only auto-connect if configured port is available at server startup. Also bugfixes. 2013-06-29 20:28:37 +02:00
Gina Häußge 8231e70b44 Added tab in settings for serial connection options 2013-06-29 20:20:27 +02:00
Gina Häußge b0518a71a3 Also provide access to the auto-connect setting in the connection and the settings dialog 2013-06-29 19:57:46 +02:00
Gina Häußge 30e1624127 Merge remote-tracking branch 'CapnBry/autoconnect' into devel 2013-06-29 19:16:10 +02:00
Gina Häußge 04ce284085 Just in case something goes wrong during reading the git repo information... 2013-06-29 13:43:45 +02:00
Gina Häußge 1caba2d634 Added git information to website 2013-06-29 13:41:39 +02:00
Bryan Mayland b75a0ec5c3 Add a serial.autoconnect setting to connect to the printer on startup 2013-06-26 10:19:32 -04:00
Gina Häußge ae438ca03f Fixed evaluation of "remember login" function 2013-06-25 20:09:40 +02:00
Gina Häußge 09ae8fcdc2 Always send M110 with the new line number (default 0)
Previously it worked since the first command of every print was forced to be an M110 and the line number at the beginning of each print was always forced back to 0 as well. Now it just uses the actual line number (increased on each sent of a checksumed/numbered line) and resets that when an M110 is encountered. What was missing was forcing the line number of the actual M110 command to the desired line number as well. Should be "more correct" than before now, and work.
2013-06-25 20:05:31 +02:00
Gina Häußge 695f3f391c Also send identity_changed event on passive login 2013-06-25 19:07:43 +02:00
Gina Häußge bd61d45e27 Missed the settings when changing api -> allow to api -> enabled 2013-06-24 17:48:13 +02:00
Gina Häußge 6989613b99 Moved printer state to API endpoint, made apikey instead of login necessary 2013-06-23 21:24:19 +02:00
Gina Häußge 599bca12a9 Changed api > allow to api > enabled for consistency 2013-06-23 19:48:12 +02:00
Gina Häußge e17fa031c8 Return proper http status codes in case of problems 2013-06-23 16:57:38 +02:00
Gina Häußge c6e15a7d32 Merge branch 'richardjm-devel' into devel
Conflicts:
	octoprint/server.py
	octoprint/settings.py
	octoprint/templates/index.jinja2
2013-06-23 16:09:31 +02:00
Gina Häußge 31045b4c25 Merge branch 'peteruithoven-master' into devel
Conflicts:
	octoprint/timelapse.py
2013-06-23 14:58:58 +02:00
Bryan Mayland 329656837a Renamed flipX, flipY to flipH, flipV, made update upon change instant, also made timelapse video reflect flipped webcam 2013-06-23 14:57:48 +02:00
Gina Häußge 79f2cd0e31 Merge branch 'devel' into events
Conflicts:
	octoprint/util/comm.py
2013-06-22 15:08:53 +02:00
Gina Häußge f041c6b4f3 First work on custom controls with printer feedback evaluation and presentation in the UI 2013-06-21 20:50:57 +02:00
peteruithoven ecfdb37f93 Adding classes according to flipX, flipY settings and flipping using css 2013-06-19 02:39:49 +02:00
peteruithoven e8913e3141 Adding settings for webcam flipX and flipY 2013-06-19 00:42:43 +02:00
Gina Häußge 0e56952913 Finalized decoupling of timelapse from printer module, made sure timelapse is properly unregistered from eventbus on change 2013-06-16 22:42:18 +02:00
Gina Häußge 236e26979f Switched Timelapses to using Eventbus instead of direct connection 2013-06-16 21:50:50 +02:00
Gina Häußge ed9e93f379 Merge branch 'devel' into events
Conflicts:
	octoprint/printer.py
	octoprint/server.py
	octoprint/util/comm.py
2013-06-16 11:50:52 +02:00