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

1466 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
35b010b059 Better fitting error message when opening a known serial port fails (e.g. due to permission problems), auto detection errors now got their own message 
Fixes #294
 2013-11-10 20:29:37 +01:00
Gina Häußge
fdfa433243 Fixed #296 2013-11-10 18:55:36 +01:00
Gina Häußge
aa69d181bf Fixed load API 2013-11-10 17:31:55 +01:00
Gina Häußge
e9f218208d Merge remote-tracking branch 'origin/devel' into devel 2013-11-09 20:30:04 +01:00
Gina Häußge
8ca3baee04 Fixed a couple of things with the new blueprints, should work now 2013-11-09 20:26:18 +01:00
Gina Häußge
3c68353c57 Merge pull request #293 from tonnerre/sane-ulimit 
Don't give everyone write access to octoprint data.
 2013-11-04 09:22:32 -08:00
Gina Häußge
fe37ab3cd8 Refactored server.py into submodules, extracted ajax and rest api into their own blueprints, and while doing all this also took care of #291 2013-10-28 22:08:36 +01:00
Gina Häußge
f2b0bfb7dc Merge pull request #292 from tonnerre/devel 
Remove the version name from the minified less.js version.
 2013-10-27 10:58:52 -07:00
Tonnerre LOMBARD
f7f8c09a77 Actually, umask 002 is what we want here. 2013-10-27 02:39:29 +02:00
Tonnerre LOMBARD
37c949e83b Currently, octoprint gives write access to all files in its data 
directory to everybody.

This was probably considered appropriate for the case of octoprint
running on a single-user device, but given that Unix has groups
support, it is not necessary, and can be very harmful.
 2013-10-27 02:32:14 +02:00
Tonnerre LOMBARD
b35258fad6 Remove the version name from the minified less.js version. 2013-10-26 23:28:38 +02:00
Gina Häußge
1a6030c737 Added missing docstring 2013-10-21 10:29:59 +02:00
Gina Häußge
9008a2fb7f Moved axes inverting to printer settings, changed naming and data format a bit 2013-10-20 22:22:58 +02:00
Gina Häußge
47f8ab24d9 Introduced event queue to properly decouple event processing from firing 2013-10-20 22:21:42 +02:00
Gina Häußge
4b41a47f93 Merge branch 'CapnBry-invertany' into devel 
Conflicts:
	src/octoprint/templates/settings.jinja2
 2013-10-20 15:28:18 +02:00
Gina Häußge
5d69ee8abc Added installation section to README with links to the setup guides in the Wiki and OctoPi 2013-10-20 15:24:13 +02:00
Gina Häußge
edd801aa7b Only process gcode files during backlog processing (compare #268) 2013-10-20 15:05:22 +02:00
Gina Häußge
ef8787acf9 Removed obsolete GcodeLoader in printer module 
(cherry picked from commit a7eb5f6493)
 2013-10-20 15:03:14 +02:00
Gina Häußge
29a9ee40d5 SwallowOkAfterResend isn't repetier only anymore 
(cherry picked from commit 48f5a44)
 2013-10-20 14:53:31 +02:00
Gina Häußge
4094d28c07 Make swallowOkAfterResend default to True, part of the fix for #166 
(cherry picked from commit 5a6cd58)
 2013-10-20 14:52:37 +02:00
Gina Häußge
3b56cdaaa3 Unbind old click handlers from confirmation dialog before use. 
Fixes #279
 2013-10-13 19:38:04 +02:00
Gina Häußge
079806f11c Merge pull request #278 from DanLipsitt/patch-1 
Delete empty .gitmodules
 2013-10-13 03:43:11 -07:00
DanLipsitt
69052d7670 Delete empty .gitmodules 
The empty .gitmodules file creates problems with git<->bzr interop.
 2013-10-11 16:23:27 -07:00
Bryan Mayland
2afd715f77 Move the Invert Controls checkboxes to the bottom of the settings dialog 
Also replace my tabs with space. We're doing spaces instead of tabs now?
Maybe just for html.
 2013-09-26 09:44:33 -04:00
Bryan Mayland
8d78104be8 Allow inverting of any control axis from the webui, not just Z 
Users who have already set the "invert Z" option must re-enable the
setting as the storage of the option has changed.
 2013-09-26 09:41:09 -04:00
Gina Häußge
076c6764a0 Properly restart sd prints 
Fixes #258
 2013-09-23 21:57:54 +02:00
Gina Häußge
8ff48ed88d Moved filetype decision stuff into gcodefiles module 2013-09-23 21:36:12 +02:00
Gina Häußge
00501f0913 Added code to move old octoprint folder out of the way 
Might be left over after an update due to contained .pyc files that then cause the actual application start-up to fail.
 2013-09-23 20:38:35 +02:00
Gina Häußge
4b05f125a0 Changed SD filename generation, made SD handling more reliable as a whole (cherry picked from commit 717ec041) 2013-09-23 18:40:46 +02:00
Gina Häußge
df05a80201 Do not crash if SD card fails in firmware 2013-09-22 22:14:46 +02:00
Gina Häußge
6b2912b0e2 Changed renaming to sd filenames to also work properly with very short names (and names with more .) as at least Marlin seems to hiccup on something like "file.gco.gco" 2013-09-22 16:04:36 +02:00
Gina Häußge
4ea2345eda Added .g to the allowed extensions for file uploads 2013-09-22 15:31:55 +02:00
Gina Häußge
a7477e0184 Added option to invert Z axis controls 2013-09-22 12:52:39 +02:00
Gina Häußge
6492ab66b0 Workaround for issue described in #250 2013-09-16 22:28:21 +02:00
Gina Häußge
78972b1d40 New init script that also evaluates "/etc/default/octoprint" for additional startup options and the like, courtesy of Sami Olmari 2013-09-16 18:09:39 +02:00
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