Philipp Engel
221ea637be
Merge remote-tracking branch 'upstream/devel' into mrbeam
...
Conflicts:
src/octoprint/printer/__init__.py
src/octoprint/server/__init__.py
src/octoprint/settings.py
src/octoprint/static/css/octoprint.css
src/octoprint/static/js/app/main.js
src/octoprint/static/js/i18n/de.js
src/octoprint/static/js/i18n/fr.js
src/octoprint/static/js/i18n/he.js
src/octoprint/static/js/i18n/nl.js
src/octoprint/static/js/i18n/no.js
src/octoprint/static/js/i18n/ro.js
src/octoprint/templates/index.jinja2
src/octoprint/templates/settings.jinja2
src/octoprint/translations/de/LC_MESSAGES/messages.mo
src/octoprint/translations/de/LC_MESSAGES/messages.po
src/octoprint/translations/fr/LC_MESSAGES/messages.mo
src/octoprint/translations/fr/LC_MESSAGES/messages.po
src/octoprint/translations/he/LC_MESSAGES/messages.mo
src/octoprint/translations/he/LC_MESSAGES/messages.po
src/octoprint/translations/messages.pot
src/octoprint/translations/nl/LC_MESSAGES/messages.mo
src/octoprint/translations/nl/LC_MESSAGES/messages.po
src/octoprint/translations/no/LC_MESSAGES/messages.mo
src/octoprint/translations/no/LC_MESSAGES/messages.po
src/octoprint/translations/ro/LC_MESSAGES/messages.mo
src/octoprint/translations/ro/LC_MESSAGES/messages.po
src/octoprint/util/comm.py
2015-01-09 18:11:40 +01:00
Gina Häußge
3d5fdf2a91
Fixed bug that caused SSDP discovery not to work anymore
...
Blueprint was protected by API key which lead to the discovery.xml
file not being retrievable.
2015-01-01 01:52:41 +01:00
Gina Häußge
c9c4066331
Fixed a bunch of doc issues, updated /api/printer/command to have more meaningful error messages
2014-12-31 15:47:12 +01:00
Gina Häußge
835b973bdc
Merge branch 'patch-1' of https://github.com/bortek/OctoPrint into devel
...
Conflicts:
docs/api/printer.rst
2014-12-31 15:19:18 +01:00
Gina Häußge
bf6a32907c
Ported possibility to set external host via headers from reverse proxy to the devel branch
2014-12-31 15:09:31 +01:00
bortek
2b7885c3f8
Update printer.rst
2014-12-30 12:18:39 +01:00
Gina Häußge
749af60796
Merge branch 'master' into devel
...
Conflicts:
src/octoprint/server/util.py
src/octoprint/settings.py
src/octoprint/templates/index.jinja2
2014-12-30 10:49:03 +01:00
Gina Häußge
87ddcac2fc
Don't user server.host but server.forwardedHost as fallback for generated external URLs
...
Closes #698
2014-12-30 10:20:50 +01:00
Gina Häußge
e3383fe4c1
Generated URLs now take X-Forwarded-Host header sent by proxies into account for included host and port
2014-12-29 20:48:33 +01:00
Gina Häußge
292856e1bd
Fixed relative URL to sockjs endpoint, wasn't yet using the proper base url
2014-12-29 20:45:54 +01:00
Gina Häußge
3dacaaf03a
Merge branch 'master' into devel
2014-12-28 00:20:11 +01:00
Gina Häußge
6307b765e3
Only decrement the image counter if it is set and larger than 0
...
Backported from devel
2014-12-28 00:19:55 +01:00
Gina Häußge
eb2561175d
Merge branch 'master' into devel
...
Conflicts:
setup.py
src/octoprint/timelapse.py
2014-12-28 00:18:49 +01:00
Gina Häußge
a30e41f0b4
Timelapses: Do not try to use image counter if still set to None and synchronize decrementing of image counter via mutex as well
...
Possible fixes for #693 , the latter maybe also for #690
2014-12-28 00:12:19 +01:00
Gina Häußge
51341f6722
Added removal of pyc files (and their parent folders if they are empty after that) to the python setup.py clean command
...
(cherry picked from commit 9e014eb
2014-12-28 00:00:57 +01:00
Gina Häußge
fb15751703
Decrease image counter if an image could not be captured from webcam
...
Should keep rendering of timelapse from breaking if only a couple of images couldn't be captured due to whatever reason. Suggested by @midopple in #344
(cherry picked from commit bf9d5ef
2014-12-27 23:55:23 +01:00
Gina Häußge
a0105bcb2f
Better error handling for capture issues during timelapsing
...
Should help debugging issue #425 and any future problems in that area.
(cherry picked from commit 1a7a468
2014-12-27 23:52:38 +01:00
Teja
96223a53fe
quick fix. avoids sending M110 N0 command as it is not supported by grbl. fixes #2
2014-12-22 13:14:54 +01:00
Teja
b85ee58b4e
fixes fan on / off buttons. adds a focus disable button.
2014-12-22 12:57:29 +01:00
Gina Häußge
103e0796b7
Request available slicers and slicing profiles from backend asynchronously when opening the slicing dialog
...
Should make sure that slicers and new profiles are detected correctly even without reload.
Could maybe help with #689
2014-12-21 15:57:23 +01:00
Gina Häußge
363b23d6e3
Better handling of errors while sending to (disconnected) clients on the websocket
2014-12-21 15:47:24 +01:00
Gina Häußge
52ad02a08a
Updated the changelog with a lot of stuff that gone done the past weeks
2014-12-21 15:32:30 +01:00
Gina Häußge
977cf3c383
Added handler for uncaught exceptions to make sure those get logged
2014-12-21 15:32:07 +01:00
Gina Häußge
827ea36d72
Merge remote-tracking branch 'origin/devel' into devel
2014-12-21 15:16:34 +01:00
Gina Häußge
46b0367335
Log a message to octoprint.log if Cura is not fully configured and hence not available for slicing yet.
...
As suggested in #689
2014-12-21 15:15:59 +01:00
Gina Häußge
596afddfb6
Merge pull request #685 from Bevaz/bug_video_output_filename
...
Enframed output video filename with quotes.
2014-12-20 18:05:50 +01:00
Gina Häußge
256c2dfdbe
More error resilient handling of .metadata.yaml writes in local storage
...
Writes updated metadata to a backup file first and then copies it atomically (at least under anything that is not windows where the operation is a bit more complicated and hence not atomic)
2014-12-20 01:06:40 +01:00
Gina Häußge
0737ee65bd
Support action: commands sent from printer, for now only pause, resume and disconnect are supported, plus a new hook "octoprint.comm.protocol.action" to add handlers of custom actions via plugins.
...
Added "!!DEBUG:" command to virtual printer to be able to trigger such commands to be sent by it.
2014-12-20 00:31:46 +01:00
Gina Häußge
8998be66eb
Don't accidentally include a newline from the mime headers in the parsed multipart data
...
Fixes #680
2014-12-19 12:28:02 +01:00
Gina Häußge
1180cac147
Fixed heated bed option not being properly displayed in printer profiles
...
Fixes #683
2014-12-19 10:01:00 +01:00
Gina Häußge
270231a004
Fixed extruder offsets not being properly editable in printer profiles
...
Closes #677
2014-12-19 09:54:11 +01:00
Gina Häußge
c2f0f6c7c4
[i18n] Translation update
2014-12-18 15:15:23 +01:00
Gina Häußge
c7afae38a8
Rolled back appearance settings
...
Associating them with the current printer profile is misleading as long as a printer profile represents both a physical printer and a type machine. In the future this association will have to be split, to allow for configuration of printers with respective machine profiles (name subject to be changed).
2014-12-18 13:48:19 +01:00
Gina Häußge
873a825e57
Commented out loggers used for debugging/evaluating print time estimation
2014-12-18 12:02:14 +01:00
Gina Häußge
dc2318f404
Use the rolling average of the last n estimations instead of the current estimation for reporting print time left
2014-12-18 12:01:01 +01:00
Bevaz
699ed1da4d
Enframed output filename with quotes.
2014-12-17 22:08:47 +03:00
Gina Häußge
d8b95f845c
If the G4 isn't returned, it won't be sent to the printer
2014-12-17 18:33:26 +01:00
Gina Häußge
014d39c11d
Fetch estimated print time from cura slicing result, create print time statistics per printer profile, interpolate between stats and live estimation during printing for print time left
2014-12-17 17:31:30 +01:00
Gina Häußge
a544a852f2
Some minor cleanup
2014-12-17 12:52:02 +01:00
Gina Häußge
3311a48e3a
Merge branch 'issue_658' of https://github.com/vishnubob/OctoPrint into vishnubob-issue_658
...
Conflicts:
src/octoprint/util/comm.py
2014-12-17 12:50:37 +01:00
Philipp Engel
f1511c2076
bumped tornado to version 4.0.2
2014-12-16 18:45:52 +01:00
Philipp Engel
c8273e9e12
Revert "changed tornado dependency to local (RPi date fix)"
...
This reverts commit f812658714
2014-12-16 18:41:43 +01:00
Philipp Engel
08b60784ea
new try for fixed deps
2014-12-16 17:48:33 +01:00
Philipp Engel
f812658714
changed tornado dependency to local (RPi date fix)
2014-12-16 17:08:35 +01:00
Gina Häußge
5ac908afd4
Pauses in the print job are now cleaned from the basis for print time estimation, also switched to a rolling window approach for determining when estimation becomes stable
2014-12-16 13:27:31 +01:00
Gina Häußge
12a3e659b1
Added new plugin type ProgressPlugin
...
Plugins can implement that to get notified of progress in both print and slicing jobs in 1% increments.
2014-12-15 21:29:18 +01:00
Gina Häußge
b0780af7fa
Removed a possible race condition when slicing to the same gcode file in direct succession
2014-12-15 18:35:15 +01:00
Gina Häußge
2ec31c7521
Removed a left-over from print time estimation experiments that got overlooked
2014-12-15 11:38:17 +01:00
Gina Häußge
f2562500a3
Print time estimation is now not displayed until it becomes somewhat stable
2014-12-12 23:38:57 +01:00
Gina Häußge
85a567bdab
More error resilience when logging success/failure of prints
2014-12-11 18:32:17 +01:00
