Commit graph

3556 commits

Author SHA1 Message Date
Gina Häußge
1d3dfffc67 Some documentation fixes 2016-03-23 10:40:36 +01:00
Gina Häußge
05ce46ccc4 Update click and cookiecutter dependencies 2016-03-23 10:40:09 +01:00
Gina Häußge
ca0fd2397e Fix a bunch of issues with the update script
* was still only reading one line per 500ms, now reads
     all available lines from stdout and stderr
  * patch was written with too many newlines
  * git reset was missing --hard parameter for forced versions
  * proper unicode handling
  * added git clean for code base reset
  * make sure path to python executable doesn't have left-over
    quotes on windows
2016-03-23 10:39:20 +01:00
Mark Walker
c433e32e6c Include extra extruder start/end.gcode in import
Prior to this change, start2.gcode, end2.gcode, start3.gcode,
end3.gcode, etc. were ignored due to the index coming before the period.

Fixes #1289
2016-03-22 22:16:26 -07:00
Gina Häußge
d8ea8efd68 Added @Alex9779 to AUTHORS.md 2016-03-18 15:36:59 +01:00
Gina Häußge
cbb44ffce8 Small whitespace fix & position change of help text 2016-03-18 15:31:44 +01:00
Gina Häußge
d31b85b6e3 Use dict constructor instead of {} + update
Way cleaner look and more consistent.
2016-03-18 15:25:27 +01:00
Gina Häußge
1f4f698046 Minor logic change to simplify code 2016-03-18 15:24:59 +01:00
Gina Häußge
4d12f3ece9 Merge branch 'zChangeTimelapseWithRetractionZHop' of https://github.com/Alex9779/OctoPrint into pr/Alex9779/zChangeTimelapseWithRetractionZHop
Conflicts:
	src/octoprint/server/api/timelapse.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/viewmodels/timelapse.js
	src/octoprint/timelapse.py
2016-03-18 15:09:38 +01:00
Gina Häußge
7bdc4418fd Merge branch 'maintenance' into devel
Conflicts:
	CHANGELOG.md
	docs/configuration/config_yaml.rst
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/server/__init__.py
	src/octoprint/settings.py
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/templates/dialogs/settings/serialconnection.jinja2
	src/octoprint/util/comm.py
2016-03-16 11:24:52 +01:00
Gina Häußge
a229cbfd49 maintenance branch is now 1.2.11.dev 2016-03-16 10:55:08 +01:00
Gina Häußge
692166f067 Preparing release of 1.2.10 2016-03-16 09:38:58 +01:00
Gina Häußge
69dca5b58c Updated german translation 2016-03-16 09:22:10 +01:00
Gina Häußge
6305c4d2eb Timeout for comm closing, also wait for send queue on close
We don't want to wait indefinitely for our send and command queues to empty, so
we don't use .join but instead a busy timeout wait routine.

Also fixed a couple of small issues found while preparing comm unit tests.
2016-03-15 17:09:01 +01:00
Gina Häußge
b5cf20a1de Have comm layer wait until all lines are sent before disconnect
Added parameter "wait" to "close" method, defaults to True. Will have the
close method wait for all lines to be sent that are currently in the send queue.

In case of an error, no waiting will be done.

Made it necessary to correctly track task completion in the send queue, also
made that change to the command queue while at it.

Backported from devel, commit 7f2476e513
2016-03-14 11:59:02 +01:00
Gina Häußge
5807b606f0 Added @2bitoperations to AUTHORS.md
Was missing from PR #1255
2016-03-14 11:50:50 +01:00
Andrew Malota
398eaf58a9 allow download/management of mp4 timelapse too
(cherry picked from commit a00faf2)
2016-03-14 11:48:58 +01:00
Gina Häußge
4a933228c7 Added PR and issue templates, updated CONTRIBUTING.md 2016-03-14 11:43:15 +01:00
Alexander Leisentritt
2a2871404e added a note to the z-hop setting with remarks 2016-03-13 13:42:50 +00:00
Alexander Leisentritt
c78342140e if no z-hop is set (aka set to 0) always capture an image on z-change 2016-03-13 13:41:06 +00:00
Gina Häußge
56caa7750c Twice as fast checksum calculation
Thanks @nophead!
2016-03-12 09:40:33 +01:00
Gina Häußge
38a47bb2a8 Change wording: not firmware error, but communication error
"Error:" lines can also be produced by OctoPrint itself in case of serial exceptions or
connection failures, so "the firmware reported" was misleading.
2016-03-11 18:06:14 +01:00
Gina Häußge
e6f9003549 Reset line numbers before entering sd upload state
Otherwise M110 N0 will not be processed to be prefixed with N0 and hence
not reset the line numbers on the printer to 0.

That was as bug in 1a308a1bc7
2016-03-11 18:01:22 +01:00
Gina Häußge
5cadf85401 Only report transfer rates in the log for sd uploads
For real prints they are misleading - mechanical movement takes time.
2016-03-11 17:58:00 +01:00
Gina Häußge
baab1ce70a Use new generic TypedQueue for send queue and command queue
That way no M105 cascades can be triggered by the  M105 polling timer (or the M27
polling timer).

Adjusted logging output to make clear which queue rejected typed entry.

Made timeout handler send M105 with type "temperature" as well to make sure
we don't suddenly have two M105 directly after each other in the send_queue,
one from the polling timer, one from the timeout handler.

Fixes #1275
2016-03-11 17:25:39 +01:00
Gina Häußge
cbaf848711 Move TypedQueue to octoprint.util & make generic
put and get are now overwritten to create t-tuple out of provided item
and item_type on put, and to only return item on get.

_put and _get extract item_type and use that for managing the
lookup set.
2016-03-11 17:20:26 +01:00
Gina Häußge
85060b972a Fix _handle_timeout not correctly honoring long runners
Issue was introduced through #1271 fix.
2016-03-11 17:20:13 +01:00
Gina Häußge
29aefdec08 Don't send M20 twice after streaming to SD
Fixes #1274
2016-03-11 16:48:03 +01:00
Gina Häußge
6e01a361c5 Make "Fake Acknowledge" button really fake an ok
So far it only set the clear_to_send flag, now it actually does everything
else a read ok would do.
2016-03-11 16:35:15 +01:00
Gina Häußge
542ccb5421 Slight simplification of setProgressData calls in standard printer 2016-03-11 16:29:59 +01:00
Gina Häußge
6d8eb682c1 Use concatenation instead of format strings in comm layer 2016-03-11 12:45:30 +01:00
Gina Häußge
d701c261c3 Less processing overhead when uploading to SD
Better structured "don't handle phases" checks and adjusted
job wrapper that doesn't try to apply tool tracking or temperature
offsets.
2016-03-11 12:35:53 +01:00
Gina Häußge
7b16f38ba3 Fetch timeouts for communication only once from settings 2016-03-11 11:16:27 +01:00
Gina Häußge
337329eda0 Added test stub for quick performance tests of the comm layer
Running comm.py with parameters port, baudrate, local file, remote file will
upload local file to remote file on the printer's sd using the provided connection
parameters.

Example:

    python -m octoprint.util.comm /dev/ttyUSB0 115200 /path/to/some.gcode test.gco

No plugin support! Only regular serial connection supported.
2016-03-11 10:43:02 +01:00
Gina Häußge
47b7552f91 Decouple comm progress reporting from processing 2016-03-11 08:48:18 +01:00
Gina Häußge
6736224962 Removed logging from CountedEvent 2016-03-11 08:28:39 +01:00
Gina Häußge
c9009496f6 Don't trigger an M105 on timeout during a resend
Had to reorder message processing a bit in order to be able to
properly handle further resends in timeout situations.

Has the added benefit that "ok" now gets processed very early
and now extra state based processing is needed anymore.
2016-03-10 19:05:16 +01:00
Gina Häußge
d393a6730c Don't have M28 response generate extra "ok"
Fixes #1272
2016-03-10 16:03:52 +01:00
Gina Häußge
069bfdd9f8 New flag to have M29 response inject "ok"
Adjusted virtual printer to allow marking of M29 as broken re sending
of ok.

Fixes #1273
2016-03-10 15:58:59 +01:00
Gina Häußge
23d2cdec76 Use 0 as default bed temperature in slicer
Should prevent slicing result to contain bed temperature settings even if
printer has a heated bed configured unless slicing profile also contains a
temperature.

Fixes #1268
2016-03-10 11:55:17 +01:00
Gina Häußge
1a308a1bc7 Reset line numbers for sd streaming as well 2016-03-09 15:44:23 +01:00
Gina Häußge
13098dde00 Removed unused "{start|end}SdFileTransfer" 2016-03-09 15:37:33 +01:00
Gina Häußge
27d1a6ca37 Virtual printer: request correct line in dummy resend 2016-03-09 15:33:17 +01:00
Gina Häußge
1616fb4de8 Better error reporting in comm layer
Option to log last terminal lines before a resend (defaults to off for now),
more exception logging in octoprint.log in various error cases, also log
unsolvable resend requests with requested and current line number.
2016-03-09 15:24:40 +01:00
Gina Häußge
07d8d4b88d Made virtual printer a bit faster 2016-03-09 12:09:44 +01:00
Gina Häußge
2a3d9c291d Fixed a merge error 2016-03-09 11:54:05 +01:00
Gina Häußge
b36290a1f2 Added new serial config options to UI
Also pushed more advanced config option into an initially hidden
"Advanced Options" section, similar to other places.
(cherry picked from commit 84b343a)
2016-03-09 11:41:49 +01:00
Gina Häußge
48d74ef2fd Improved handshake procedure on comm layer
"Hello" command sent to printer to trigger initial handshake can now be
configured. Commands that _always_ necessitate to be sent with checksum/
line number (e.g. M110 on Marlin) can be configured as such too.

Also fixed an issue causing the "Hello" command to not be actually enqueued
first thing on opening a connection. Seems to not have caused harm in the
wild, but was unintentional.
(cherry picked from commit 5c2ae37)
2016-03-09 11:23:50 +01:00
Paul de Vries
b1711f33d2 Change for attribute with correct id 2016-03-09 09:54:34 +01:00
Alexander Leisentritt
54ef93005a fixed indentation 2016-03-07 18:10:26 +01:00