Commit graph

4853 commits

Author SHA1 Message Date
Gina Häußge
793bb714eb Preparing release of 1.3.6 2017-12-12 10:36:33 +01:00
Gina Häußge
8229842334 Revert "Some long overdue == vs === view model cleanup"
This reverts commit 8a977e8777.

Was causing at least one regression, to be redone for 1.3.7
2017-12-12 10:09:27 +01:00
Gina Häußge
38a711ac56 staging is now 1.3.6rc4 2017-12-08 16:21:05 +01:00
Gina Häußge
a8747f7e36 Fix a bug with release vs dev version detection 2017-12-08 15:09:58 +01:00
Gina Häußge
17e6f5d508 Preparing release of 1.3.6rc3 2017-12-07 17:40:04 +01:00
Gina Häußge
133a4658ee Switch to https for (plugins.)octoprint.org
Also add utm tags to the two support-octoprint links so we have a chance
to see if anyone ever actually clicks on those.
2017-12-07 16:35:01 +01:00
Gina Häußge
0a2e2ed297 Don't write default update type & method to config
If we set method to pip in 1.3.6 and then roll back to 1.3.5 we will
need to a manual config.yaml update otherwise or we will no longer be
able to update.

Be removing the force parameter and using the actual default settings
instead of current ones, we don't do that anymore.
2017-12-07 11:15:43 +01:00
Gina Häußge
6b41dbc12b staging is 1.3.6rc3.dev 2017-12-05 16:00:58 +01:00
Gina Häußge
3f4a70cf92 Prepare release of 1.3.6rc2 2017-12-05 12:34:55 +01:00
Gina Häußge
41eb9481b3 Fix offset values on API after setting one offset
Make sure to set the actual effective offsets as provided by the comm
layer (which merges incoming single offset adjustments) instead of only
setting the input, effectively nuking return of offsets set prior.

Closes #2268
2017-12-05 12:17:48 +01:00
Gina Häußge
743d590d52 model might not be set yet
So don't try to read its length right away.

Closes #2267
2017-12-05 10:54:33 +01:00
Gina Häußge
900e8a2aaf Docs: Fixed a typo 2017-12-05 10:40:20 +01:00
Gina Häußge
06816fb8dc Test: checksum missing => missing checksum 2017-12-04 16:04:38 +01:00
Gina Häußge
cc0a17f2ac Unit tests for MachineCom._handle_errors
With various Marlin and Repetier error variants.
2017-12-04 15:56:31 +01:00
Gina Häußge
9b1b4420a3 Make error messages in virtual printer configurable
We want to be able to test various firmware variants for stuff like
checksum and line number mismatches...

See also #2262
2017-12-04 11:47:29 +01:00
Gina Häußge
263925625b resend_request_communication_errors was too narrow
Didn't match Marlin's "checksum mismatch", only Repetier's "checksum
error". Since the error handler checks against
recoverable_communication_errors before
resend_request_communication_errors, we can just switch back to the more
broader check against "checksum" for the latter.

We could also have added an explicit check for "checksum mismatch"
instead but since we used to check for "checksum" and we don't know what
other varieties for this specific error might be out there in the
thousands of firmware variants (who needs consistency when they can
have a free for all?), we'll err on the side of caution instead.

Fixes #2262
2017-12-04 11:10:06 +01:00
Gina Häußge
f72dfb48e1 Fix ordering of plugin assets
Should be alphabetical per their identifier. As noticed by @BillyBlaze
2017-12-01 18:16:44 +01:00
Gina Häußge
e064400900 Link to blacklist in wizard & settings
As suggested by @Kunsi in #2256
2017-12-01 17:47:16 +01:00
Gina Häußge
107954021b staging is 1.3.6rc2.dev 2017-12-01 16:05:06 +01:00
Gina Häußge
99e1c3ac00 Remove branch from display version
It's no longer reliable since the Github archive export we'll now
usually use for upgrading does weird things when a tag is available on
more than one branch and we don't want our current stable version to
be reported as "rc/devel" just because that tag is available there too.

A full blown version number should be definitive enough considering that
if it's not a tag it will also contain the commit hash.
2017-12-01 12:48:33 +01:00
Gina Häußge
2ea8981a48 Preparing release of 1.3.6rc1 2017-12-01 12:14:52 +01:00
Gina Häußge
d1f54b5a22 More error resilience 2017-12-01 11:16:16 +01:00
Gina Häußge
1c55a12207 New link 2017-12-01 11:15:56 +01:00
Gina Häußge
58dba3a79a Update german translation
And remove some translatable text from the about dialog template of the
OctoPi support plugin.
2017-11-30 18:16:40 +01:00
Gina Häußge
e9d17f0f0f Docs: Include config options for plugin blacklist 2017-11-30 17:27:14 +01:00
Gina Häußge
4ea76f84c5 Fix log roll over logging 2017-11-30 17:26:44 +01:00
Gina Häußge
ac345daba2 Don't output pi model & serial in about dialog
Too public for this kind of information after all. The OctoPi version is
enough info.
2017-11-30 17:25:27 +01:00
Gina Häußge
3cf694a333 Also update hash on tab change
Related to #203
2017-11-30 12:50:05 +01:00
Gina Häußge
26c8c5f03f Don't fire onAfterTab twice & check tab's there
Related to #203
2017-11-30 12:49:55 +01:00
Marc Hannappel
f2bd5d605e Added active tab using hash from URL feature, as requested in issue #203
(cherry picked from commit bcb74d0)
2017-11-30 12:29:37 +01:00
Gina Häußge
0560e9da02 Disable distance buttons when printing
Closes #2232
2017-11-29 19:32:06 +01:00
Gina Häußge
cec8d15b46 Some additions to the docs
* Note that api/job is what you want for info about the selected file
    as promised in #2251
  * Added pause/resume script from
    https://gist.github.com/foosel/1c09e269b1c0bb7a471c20eef50c8d3e
    as example to the gcode scripts section (with disclaimer)
2017-11-29 19:31:56 +01:00
Gina Häußge
38c9840e30 Add note to printer profile editor about offsets
We don't need to define them in the firmware AND in OctoPrint. If they
are already set in firmware we'll otherwise get wonky issues in the
GCODE viewer or when slicing.

Closes #2229
2017-11-29 19:00:00 +01:00
Gina Häußge
f77e49be7f Use new ChainedHunk for JsPluginBundle 2017-11-29 18:53:38 +01:00
Gina Häußge
00cb71898a Some rewording and icons on final wizard page 2017-11-29 18:15:41 +01:00
Gina Häußge
328c08b775 Wrap all plugin's JS assets into same IIFE
As discussed in #2200.

For this to work we've introduced sub-bundles per plugin for the JS
assets. CSS and LESS on the other hand are basically handled as before.
We use a custom bundle class here since it's apparently not possible to
keep a sub bundle from inheriting the parent's filters, thus not
allowing us something like

  packed_plugins [js_plugin_delimiter_bundler]
    packed_plugin_a [js_delimiter_bundler]
    packed_plugin_b [js_delimiter_bundler]
    ...

The individiual bundles per plugin would inherit
js_plugin_delimiter_bundler and we'd get a double wrapper - not helpful.

Instead we now have a modified JsPluginBundle that overwrites
Bundle._merge_and_apply to further wrap the returned hunk.
2017-11-29 17:28:30 +01:00
Gina Häußge
ca7aa322c3 Some cleanup, refactoring & docs 2017-11-29 15:55:33 +01:00
Gina Häußge
5c20e264e2 Feature flag to enable legacy plugin assets
Work around issues like #2246 until the plugins that are affected are
fixed.

To be removed in 1.3.8.

See also #2200
2017-11-29 15:55:09 +01:00
Gina Häußge
aa65671ac7 Always check active flag 2017-11-28 13:05:28 +01:00
Gina Häußge
14bd0632c0 parse_requirements => Requirement.parse
Since we only ever handle one requirement here, the parse_requirements
generator (which btw needs a next m() is not the best choice.

Also extracted install command cleanup into class method and added tests
for that.

cc @markwal
2017-11-28 12:02:43 +01:00
Gina Häußge
d174d7ab80 Temporary fix for #2246 until #2200 is solved 2017-11-27 17:24:40 +01:00
Gina Häußge
a2d38016ec Fix some corner cases of print time formatting
Closes #2242
2017-11-27 12:38:13 +01:00
Gina Häußge
cf25291dee Mark readonly fields readonly instead of disabled
Further fix for FF issues with disabled input fields as tracked in
#2056 and #2196.
2017-11-27 12:23:20 +01:00
Gina Häußge
6d4f8266cd Fix message for synchronous system commands
We managed to swap those m(
2017-11-24 13:46:38 +01:00
Gina Häußge
991dab58d5 Remove experimental extension tree caching 2017-11-24 13:20:50 +01:00
Gina Häußge
0de0e4ea9b Handling of non gcode SD file transfers
No guarantees however that transporting anything BUT gcode via the usual
M28/M29 interface will even remotely work. Note that it most likely
won't work if the transferred file contains an M29 (= end transfer),
just like with transferred GCODE files.

Also note that stuff like config files or some such that might be
transferred might contain lines that are too large to fit into the
buffer of the printer. This is really just to enable plugins to maybe do
some nifty stuff, no official support of streaming arbitrary files to
the printer's SD (for that we'd need WAY more firmware support first).

See jneilliii/OctoPrint-SmoothiewareConfig#1
2017-11-24 13:11:23 +01:00
Gina Häußge
9b3c1947d9 Limit SD transfers to broader machinecode type
See jneilliii/OctoPrint-SmoothiewareConfig#1
2017-11-24 13:08:10 +01:00
Gina Häußge
364d692db2 Support leaf merging for file extension tree
This allows us to add new extensions to existing entries (e.g. a new
extension for gcode files)
2017-11-24 13:07:16 +01:00
Gregers Gram Rygg
b002e41a00 Respond with 411 Length Required when missing 2017-11-24 11:32:07 +01:00
Gina Häußge
f3080daa47 Merge branch 'maintenance' of github.com:foosel/OctoPrint into maintenance 2017-11-24 11:31:44 +01:00