pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1431 commits 20 branches 22 tags 141 MiB
Commit graph

1431 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
51ae782f02 Moved octoprint sources to "src" folder, adjusted setup.py and run script accordingly 2013-09-15 21:45:33 +02:00
Gina Häußge
a87541c354 Merge branch 'devel' into slicerSupport 2013-09-10 23:18:30 +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
4fbb8f1164 Added requirements for testing 2013-09-09 21:58:31 +02:00
Gina Häußge
32b2c1e2e7 Fixed/added unit test 2013-09-09 21:53:13 +02:00
Gina Häußge
242e552f4d Bugfix: Do not allow STL file upload if Cura support is not enabled 2013-09-09 20:57:09 +02:00
Gina Häußge
d7e6d51cc2 Use progress bar to inform about ongoing slicing, popup a notification on completion anyways. Also properly handle failed slicing and notify about that. 2013-09-09 19:27:17 +02:00
Gina Häußge
708c12ddbe Removed another (accidental?) check-in 2013-09-09 16:59:00 +02:00
Gina Häußge
21d16c8ba0 Fixed some whitespace, removed some (accidental?) check-ins 2013-09-09 16:58:02 +02:00
Gina Häußge
51b0df5c1f Also measure time needed for slicing and include it in event payload, display that in the UI too 2013-09-09 16:55:06 +02:00
Gina Häußge
f07305ae4f Fixed a couple of merge issues, changed way Cura is called (just using "python" won't work in environments where the default python executable doesn't bring the necessary dependencies to run Cura, now using Cura startup script instead), introduced some messaging to notify UI what's going on. 2013-09-09 16:51:46 +02:00
Gina Häußge
b352078917 Merge branch 'devel' into henricksonrw-cura-integration 
Conflicts:
	octoprint/gcodefiles.py
	octoprint/printer.py
	octoprint/server.py
	octoprint/static/js/ui.js
	octoprint/util/__init__.py
 2013-09-09 11:41:24 +02:00
Ross Hendrickson
79f379a868 Update tests and locations to reflect cura module move 2013-09-08 19:49:26 -05:00
Ross Hendrickson
520c856c57 Move cura to slicer module. Fix integration points. 2013-09-08 19:41:33 -05:00
Ross Hendrickson
7a4bb8b94e Remove curaEngine from code 2013-09-08 19:35:24 -05:00
Ross Hendrickson
4b7300c2e8 Move cura settings into feature UI block 2013-09-08 16:07:16 -05:00
Ross Hendrickson
a7b7f26da5 Remove development logging 2013-09-08 16:00:46 -05:00
Ross Hendrickson
26ebfe3e1f Fix remove bug when removing gcode only files 2013-09-08 15:09:10 -05: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
Ross Hendrickson
8212f28b90 Cura working with new output option 2013-08-29 21:17:30 -05: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