Commit graph

3729 commits

Author SHA1 Message Date
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
Gina Häußge
40cefe7a89 Merge pull request #1255 from 2bitoperations/add-mp4
allow download/management of mp4 timelapse too
2016-03-07 15:41:49 +01:00
Andrew Malota
a00faf2a33 allow download/management of mp4 timelapse too 2016-03-07 07:44:11 -06:00
Ben Stern
5af78de226 Add output in Fahrenheit as well as Celsius. 2016-03-05 14:25:16 -05:00
Paul de Vries
5c83aef52d Use _.isPlainObject over $.isPlainObject 2016-03-04 18:29:05 +00:00
Gina Häußge
35e20162ec Revert "Improved connecting phase"
Improved connecting for some printers, destroyed it
completely for others, so this needs some more work/
thought before it's ready for prime time.

This reverts commit c82ec3d3af.
2016-02-22 13:33:34 +01:00
Paul de Vries
0827ae10f2 Rename format into returnObject w/ (true/false/undefined) 2016-02-18 22:41:53 +00:00
Paul de Vries
f67da6507f Fix typo and move prefix into function call 2016-02-18 21:55:22 +00:00
Paul de Vries
ef411298e2 Add ability to push only a function in the OCTOPRINT_VIEWMODELS array
Add more comments
Fine tweak code:
 - Remove vanilla Object check with jQuery (lodash gives invalid result on arrays with isObject)
 - Add function check on constructor
 - Generate function name on anonymous functions
2016-02-18 21:27:36 +00:00
Gina Häußge
c82ec3d3af Improved connecting phase
M110 is now sent every second until either a connection is established or the connection
attempt times out. That should prevent connection handshakes from failing due to
some initial garbage on the line that swallows an ok.
2016-02-17 11:33:49 +01:00
Paul de Vries
f5fbd773dc 1. Objectify the OCTOPRINT_VIEWMODEL pool
2. Add optional viewmodel(s) by pushing an extra array or by using object.optional
3. Add format option and return dependencies as object, by default it will return an array
2016-02-17 00:19:14 +00:00
Paul de Vries
fbbb5b4d7e Simplefy debug message with lodash/underscore 2016-02-16 20:46:02 +00:00
Gina Häußge
5c06bd5036 Kill background tasks of virtual printer on disconnect
Otherwise there might be errors with wait-for-heatup or sd printing
situations where self.outgoing is gone suddenly.
2016-02-16 15:09:22 +01:00
Gina Häußge
21034b381c Cancelling a print that is not ongoing doesn't make sense 2016-02-16 10:04:06 +01:00
Gina Häußge
beb5850361 Only try to record recovery data if a print was ongoing 2016-02-16 10:03:02 +01:00
Gina Häußge
1ea0cf9213 Always reset the job data on disconnect
If former state was "Printing", so far the full disconnect state handling
wasn't done properly.
2016-02-16 09:52:56 +01:00
Gina Häußge
4081a25f48 Merge branch 'fix/errorOnSdCardFail' into maintenance 2016-02-16 09:28:43 +01:00
Gina Häußge
718a102d44 Merge branch 'fix/wrongTrackingOfM109ForMultiextruder' into maintenance 2016-02-16 09:24:44 +01:00
Gina Häußge
49f4a0c5b0 line == "ok" => line.startswith("ok")
Fixes an issue introduced with M109 fix that causes
"SD card ok" not to be parsed correctly anymore.
2016-02-16 09:23:25 +01:00
Gina Häußge
d267a752cd Capture NoSuchStorage error on SD card fails
We currently do not have a storage configured for SD card since
that hasn't yet been ported to the storage interface. So on an
SD card fail we need to capture that error when attempting to log
the print recovery data, or there will be issues processing
the cancel properly. A bit more of error handling is a good
idea here in any case too.

Fixes #1226
2016-02-16 09:13:22 +01:00
Gina Häußge
632724a023 Updated CONTRIBUTING.md
* Don't add red herrings to tickets
  * Provide all information when actually experiencing the same
     symptoms as an existing ticket
2016-02-16 08:42:05 +01:00
Gina Häußge
eb48a50139 Fixed wrong tracking of current tool for M109 Tn heat-ups 2016-02-15 19:44:21 +01:00
Gina Häußge
cb687f01f7 Merge branch 'maintenance' into devel
Conflicts:
	src/octoprint/static/js/app/viewmodels/files.js
	src/octoprint/util/pip.py
2016-02-15 10:01:02 +01:00
Gina Häußge
0a3dc4b354 Fixed a bug that prevented the "Upload to SD" button from working
Introduced with the bug fix for #1196

Closes #1224
2016-02-15 09:58:04 +01:00
Gina Häußge
fe134e7986 Added back the "test without plugins" clause to the bug reporting guide 2016-02-12 12:10:19 +01:00
Gina Häußge
eacd9f7b66 Always read all available lines from stdout and stderr
Should produce faster output.
2016-02-11 10:37:56 +01:00
Gina Häußge
b5f40cfd69 Always read all available lines from stdout and stderr
Should produce faster output.
2016-02-11 10:36:19 +01:00
Gina Häußge
f07e3d9f2d Fixed output processing for pip processes 2016-02-11 09:55:44 +01:00
Gina Häußge
b2391322d4 Removed sudo stuff from plugin manager, don't display full pip command 2016-02-11 09:38:35 +01:00
Gina Häußge
98b512b32e Correctly handle pip 1.1 2016-02-11 09:38:09 +01:00
Gina Häußge
e28ca60f21 Merge branch 'maintenance' into devel
Conflicts:
	CHANGELOG.md
2016-02-10 16:46:56 +01:00
Gina Häußge
3fb9248d2a More timelapse unit tests 2016-02-10 16:44:46 +01:00
Gina Häußge
3dd0ace076 maintenance branch is now 1.2.10.dev 2016-02-10 16:44:18 +01:00
Gina Häußge
abe68adac8 Preparing release of 1.2.9 2016-02-10 14:47:18 +01:00
Gina Häußge
99c65b8cf4 Unit test for unrendered timelapse cleanup 2016-02-10 14:40:10 +01:00