q3k/OctoPrint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1389 commits 1 branch 0 tags 18 MiB
Commit graph

1389 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
f62e868c02 Unbind old click handlers from confirmation dialog before use. 
Fixes #279
 2013-10-13 19:33:19 +02:00
Gina Häußge
b51da4bd1a Properly restart sd prints 
Fixes #258
(cherry picked from commit 076c676)
 2013-09-23 21:59:48 +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
63555d2c4b Fixed SD upload (managed to break this by introducing temperature offsets). 
Closes #249
 2013-09-10 23:17:34 +02:00
Gina Häußge
ea35b1345d Merge branch 'devel' 
Conflicts:
	octoprint/static/js/ui.js
	octoprint/util/comm.py
 2013-09-08 21:52:36 +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
b2587579ba Only enable temperature "Set" buttons if a value is entered 2013-09-08 16:11:07 +02:00
Gina Häußge
93db51ecb9 Allow definition of additional glob patterns for serial ports 
Configuration happens via config.yaml, just add additional patterns by listing them under serial > additionalPorts, e.g.

    serial:
        additionalPorts:
        - /dev/myCustomPort
        - /dev/myOtherCustomPort
 2013-09-08 16:00:47 +02:00
Gina Häußge
accf70ee6c Reset start time when (re)starting a print job 
Closes #245
 2013-09-08 15:47:47 +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
42ba2a0fc5 Only allow selecting of a file when printer is connected 2013-09-02 15:31:43 +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
e7eb9707fc Minor optimizations in gcode interpreter 2013-09-01 19:27:57 +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
8bd80ae45c Force wrapping of long gcode filenames without pythons in the popover, disallow wrapping in the table 
Fixes #239

(cherry picked from commit c36da31)
 2013-09-01 14:00:31 +02:00
Gina Häußge
c87954fcd8 Fixed variable name after renaming 2013-08-29 22:34:13 +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
7155661259 Allow switching off the heaters via the profiles again 
Closes #240
(cherry picked from commit f6173e7)
 2013-08-29 20:26:02 +02:00
Gina Häußge
f6173e7dc8 Allow switching off the heaters via the profiles again 
Closes #240
 2013-08-29 20:25:32 +02:00
Gina Häußge
edcc11376e Fixed merge error 2013-08-27 22:15:11 +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
4ab3e5424e Properly initialize timelapse when started during a paused print, better error resilience in event handler 2013-08-27 22:13:39 +02:00
Gina Häußge
54679e663e Disable drop area if not a logged in user 
Closes #212
 2013-08-27 21:40:20 +02:00
Gina Häußge
46500cea7c Implemented configurable terminal filters 2013-08-27 21:31:12 +02:00
Gina Häußge
757294d2e2 Merge branch 'devel' into customTerminalFilters 2013-08-26 17:46:36 +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
d16b96056b Properly handle failed uploads: display message, reset upload status 
(cherry picked from commit ce7ccc1)
 2013-08-25 15:10:32 +02:00
Gina Häußge
ce7ccc136b Properly handle failed uploads: display message, reset upload status 2013-08-25 15:03:27 +02:00
Gina Häußge
30c837fa13 Added .gco to supported extensions 
(cherry picked from commit d51aa65)
 2013-08-25 14:06:40 +02:00
Gina Häußge
d51aa65cd2 Added .gco to supported extensions 2013-08-25 14:05:52 +02:00
Gina Häußge
3e0abf1b20 New custom control type "feedback" 
Like "feedback_command", but without the button
 2013-08-21 20:33:55 +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
481a750cf6 Check if self._comm is None before trying to select a file... 
(cherry picked from commit 5631a45)
 2013-08-18 18:46:01 +02:00
Gina Häußge
456eb8cb47 Only match "rs"/"resend" on the start of a line, otherwise the wrong lines might be interpreted as resend requests 
(cherry picked from commit ae09a50)
 2013-08-18 18:45:50 +02:00
Gina Häußge
38c4738909 Properly enable serial logging on startup if configured 
(cherry picked from commit 2261ddf)
 2013-08-18 18:45:32 +02:00
Gina Häußge
03c9c684bf custom terminal filter WIP 2013-08-18 18:42:09 +02:00
Gina Häußge
5631a45006 Check if self._comm is None before trying to select a file... 2013-08-18 18:41:20 +02:00
Gina Häußge
ae09a50fe5 Only match "rs"/"resend" on the start of a line, otherwise the wrong lines might be interpreted as resend requests 2013-08-18 18:40: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
94b8d6601d Allow sending temperature updates with enter 
Also some refactoring.

Closes #208.
 2013-08-11 22:25:47 +02:00
Gina Häußge
84ff4b6416 Refactored ui.js into single files, cleaned up js folder 
TODO: minimizer for merging all files belonging to the actual app into one
 2013-08-11 19:15:37 +02:00
Gina Häußge
ec9c7adf70 Merge branch 'CapnBry-gcodeinterpreter-upstream' into devel 2013-08-11 17:39:53 +02:00
Gina Häußge
c7501ded47 Removed commented out and unused code 2013-08-11 17:39:45 +02:00
Gina Häußge
f622e1e181 And a robots.txt for good measure... 2013-08-11 16:57:39 +02:00