Merge branch 'maintenance' into devel
Conflicts: AUTHORS.md CHANGELOG.md src/octoprint/static/css/octoprint.css
This commit is contained in:
Gina Häußge
commit
8d226dfbaa
7 changed files with 73 additions and 29 deletions
|
|
@ -14,10 +14,10 @@ master
|
|||
HEAD
|
||||
\(detached.*
|
||||
|
||||
# maintenance is currently the branch for preparation of maintenance release 1.2.8
|
||||
# maintenance is currently the branch for preparation of maintenance release 1.2.9
|
||||
# so are any fix/... branches
|
||||
maintenance 1.2.8 6c622f7c4332b71c6ece59552ffc87c146155c84 pep440-dev
|
||||
fix/.* 1.2.8 6c622f7c4332b71c6ece59552ffc87c146155c84 pep440-dev
|
||||
maintenance 1.2.9 dedadbc9ac0305799e94ae279d3bca131629c4c5 pep440-dev
|
||||
fix/.* 1.2.9 dedadbc9ac0305799e94ae279d3bca131629c4c5 pep440-dev
|
||||
|
||||
# every other branch is a development branch and thus gets resolved to 1.3.0-dev for now
|
||||
.* 1.3.0 198d3450d94be1a2 pep440-dev
|
||||
|
|
|
|||
67
CHANGELOG.md
67
CHANGELOG.md
|
|
@ -69,24 +69,46 @@
|
|||
* [#1047](https://github.com/foosel/OctoPrint/issues/1047) - Fixed 90 degree
|
||||
webcam rotation for iOS Safari.
|
||||
|
||||
## 1.2.8 (unreleased)
|
||||
## 1.2.8 (2015-12-07)
|
||||
|
||||
### Important information for people updating from version 1.2.7
|
||||
### Notes for Upgraders
|
||||
|
||||
Due to a bug in the Software Update plugin bundled with version 1.2.7, updating
|
||||
to 1.2.8 through OctoPrint itself necessitates the installation of a plugin
|
||||
that fixes said bug (through monkey patching).
|
||||
#### A bug in 1.2.7 prevents directly updating to 1.2.8, here's what to do
|
||||
|
||||
The plugin "Updatefix 1.2.7" can be found [in the plugin repository](http://plugins.octoprint.org/plugins/updatefix127/) and
|
||||
[on Github](https://github.com/OctoPrint/OctoPrint-Updatefix-1.2.7/).
|
||||
A bug in OctoPrint 1.2.7 (fixed in 1.2.8) prevents updating OctoPrint to version
|
||||
1.2.8. If you try to perform the update, you will simply be told that "the update
|
||||
was successful", but the update won't actually have taken place. To solve this
|
||||
hen-egg-problem, a plugin has been made available that fixes said bug (through
|
||||
monkey patching).
|
||||
|
||||
The plugin is called "Updatefix 1.2.7" and can be found
|
||||
[in the plugin repository](http://plugins.octoprint.org/plugins/updatefix127/)
|
||||
and [on Github](https://github.com/OctoPrint/OctoPrint-Updatefix-1.2.7/).
|
||||
|
||||
Before attempting to update your installation from version 1.2.7 to version 1.2.8,
|
||||
please install the plugin via your plugin manager and restart your server.
|
||||
Afterwards you can update as usual. The plugin will self-uninstall once it
|
||||
detects that it's running under OctoPrint 1.2.8. After the self-uninstall another restart
|
||||
of your server will be triggered (if you have setup your server's restart command,
|
||||
defaults to `sudo service octoprint restart` on OctoPi) in order to really get rid of any
|
||||
left-overs, so don't be alarmed when that happens.
|
||||
please install the plugin via your plugin manager and restart your server. Note that
|
||||
you will only see it in the Plugin Manager if you need it, since it's only compatible with
|
||||
OctoPrint version 1.2.7. After you installed the plugin and restarted your server
|
||||
you can update as usual. The plugin will self-uninstall once it detects that it's
|
||||
running under OctoPrint 1.2.8. After the self-uninstall another restart of your server
|
||||
will be triggered (if you have setup your server's restart command, defaults to
|
||||
`sudo service octoprint restart` on OctoPi) in order to really get rid of any
|
||||
left-overs, so don't be alarmed when that happens, it is intentional.
|
||||
|
||||
**If you cannot or don't want to use the plugin**, alternatively you can switch
|
||||
OctoPrint to "Commit" based tracking via the settings of the Software Update plugin,
|
||||
update, then switch back to "Release" based tracking (see [this screenshot](https://i.imgur.com/wvkgiGJ.png)).
|
||||
|
||||
#### Bed temperatures are now only displayed if printer profile has a heated bed configured
|
||||
|
||||
This release fixes a [bug](https://github.com/foosel/OctoPrint/issues/1125)
|
||||
that caused bed temperature display and controls to be available even if the
|
||||
selected printer profile didn't have a heated bed configured.
|
||||
|
||||
If your printer does have a heated bed but you are not seeing its temperature
|
||||
in the "Temperature" tab after updating to 1.2.8, please make sure to check
|
||||
the "Heated Bed" option in your printer profile (under Settings > Printer Profiles)
|
||||
as shown [in this short GIF](http://i.imgur.com/wp1j9bs.gif).
|
||||
|
||||
### Improvements
|
||||
|
||||
|
|
@ -94,9 +116,9 @@ left-overs, so don't be alarmed when that happens.
|
|||
* Prepared some things for publishing OctoPrint on [PyPi](https://pypi.python.org/pypi)
|
||||
in the future.
|
||||
* [BlueprintPlugin mixin](http://docs.octoprint.org/en/master/plugins/mixins.html#blueprintplugin)
|
||||
now has an `errorhandler` decorator that serves the same purpose as
|
||||
[Flask's](http://flask.pocoo.org/docs/0.10/patterns/errorpages/#error-handlers)
|
||||
([#1059](https://github.com/foosel/OctoPrint/pull/1059))
|
||||
now has an `errorhandler` decorator that serves the same purpose as
|
||||
[Flask's](http://flask.pocoo.org/docs/0.10/patterns/errorpages/#error-handlers)
|
||||
([#1059](https://github.com/foosel/OctoPrint/pull/1059))
|
||||
* Interpret `M25` in a GCODE file that is being streamed from OctoPrint as
|
||||
indication to pause, like `M0` and `M1`.
|
||||
* Cache rendered page and translation files indefinitely. That should
|
||||
|
|
@ -104,6 +126,9 @@ left-overs, so don't be alarmed when that happens.
|
|||
* Added the string "unknown command" to the list of ignored printer errors.
|
||||
This should help with general firmware compatibility in case a firmware
|
||||
lacks features.
|
||||
* Added the strings "cannot open" and "cannot enter" to the list of ignored
|
||||
printer errors. Those are errors that Marlin may report if there is an issue
|
||||
with the printer's SD card.
|
||||
* The "CuraEngine" plugin now makes it more obvious that it only targets
|
||||
CuraEngine versions up to and including 15.04 and also links to the plugin's
|
||||
homepage with more information right within the settings dialog.
|
||||
|
|
@ -131,7 +156,8 @@ left-overs, so don't be alarmed when that happens.
|
|||
displaying bed temperature and controls and allowing the sending of GCODE
|
||||
commands targeting the bed (`M140`, `M190`) if the printer profile doesn't
|
||||
have a heated bed configured.
|
||||
* Fixed an issue that stopped the software updater working for OctoPrint. A
|
||||
* Fixed an issue that stopped the software updater working for OctoPrint. The
|
||||
updater reports success updating, but no update has actually taken place. A
|
||||
fix can be applied for this issue to OctoPrint version 1.2.7 via
|
||||
[the Updatefix 1.2.7 plugin](https://github.com/OctoPrint/OctoPrint-Updatefix-1.2.7).
|
||||
For more information please refer to the [Important information for people updating from version 1.2.7](#important-information-for-people-updating-from-version-127)
|
||||
|
|
@ -158,6 +184,11 @@ left-overs, so don't be alarmed when that happens.
|
|||
* Fixed a JavaScript error on finishing streaming of a file to SD.
|
||||
* Fixed version reporting on detached HEADs (when the branch detection
|
||||
reported "HEAD" instead of "(detached"
|
||||
* Fixed some path checks for systems with symlinked paths
|
||||
([#1051](https://github.com/foosel/OctoPrint/pull/1051))
|
||||
* Fixed a bug causing the "Server Offline" overlay to pop _under_ the
|
||||
"Please reload" overlay, which could lead to "Connection refused" browser
|
||||
messages when clicking "Reload now" in the wrong moment.
|
||||
|
||||
([Commits](https://github.com/foosel/OctoPrint/compare/1.2.7...1.2.8))
|
||||
|
||||
|
|
@ -547,7 +578,7 @@ left-overs, so don't be alarmed when that happens.
|
|||
changed under "Temperatures" in the Settings ([#343](https://github.com/foosel/OctoPrint/issues/343)).
|
||||
* High-DPI support for the GCode viewer ([#837](https://github.com/foosel/OctoPrint/issues/837)).
|
||||
* Stop websocket connections from multiplying ([#888](https://github.com/foosel/OctoPrint/pull/888)).
|
||||
* New setting to rotate webcam by 90° counter clockwise ([#895](https://github.com/foosel/OctoPrint/issues/895) and
|
||||
* New setting to rotate webcam by 90° counter clockwise ([#895](https://github.com/foosel/OctoPrint/issues/895) and
|
||||
[#906](https://github.com/foosel/OctoPrint/pull/906))
|
||||
* System commands now be set to a) run asynchronized by setting their `async` property to `true` and b) to ignore their
|
||||
result by setting their `ignore` property to `true`.
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ class PrinterProfileManager(object):
|
|||
formFactor = BedTypes.RECTANGULAR,
|
||||
origin = BedOrigin.LOWERLEFT
|
||||
),
|
||||
heatedBed = False,
|
||||
heatedBed = True,
|
||||
extruder=dict(
|
||||
count = 1,
|
||||
offsets = [
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -15,7 +15,7 @@ $(function() {
|
|||
height: 200,
|
||||
origin: "lowerleft"
|
||||
},
|
||||
heatedBed: false,
|
||||
heatedBed: true,
|
||||
axes: {
|
||||
x: {speed: 6000, inverted: false},
|
||||
y: {speed: 6000, inverted: false},
|
||||
|
|
|
|||
|
|
@ -396,10 +396,17 @@ ul.dropdown-menu li a {
|
|||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: 10001;
|
||||
display: none;
|
||||
}
|
||||
|
||||
#offline_overlay {
|
||||
z-index: 10002;
|
||||
}
|
||||
|
||||
#reloadui_overlay {
|
||||
z-index: 10001;
|
||||
}
|
||||
|
||||
#offline_overlay_background,
|
||||
#reloadui_overlay_background {
|
||||
position: fixed;
|
||||
|
|
|
|||
|
|
@ -1416,6 +1416,11 @@ class MachineCom(object):
|
|||
return False
|
||||
|
||||
def _handleErrors(self, line):
|
||||
if line is None:
|
||||
return
|
||||
|
||||
lower_line = line.lower()
|
||||
|
||||
# No matter the state, if we see an error, goto the error state and store the error for reference.
|
||||
if line.startswith('Error:') or line.startswith('!!'):
|
||||
#Oh YEAH, consistency.
|
||||
|
|
@ -1425,15 +1430,16 @@ class MachineCom(object):
|
|||
if regex_minMaxError.match(line):
|
||||
line = line.rstrip() + self._readline()
|
||||
|
||||
if 'line number' in line.lower() or 'checksum' in line.lower() or 'format error' in line.lower() or 'expected line' in line.lower():
|
||||
if 'line number' in lower_line or 'checksum' in lower_line or 'format error' in lower_line or 'expected line' in lower_line:
|
||||
#Skip the communication errors, as those get corrected.
|
||||
self._lastCommError = line[6:] if line.startswith("Error:") else line[2:]
|
||||
pass
|
||||
elif 'volume.init' in line.lower() or "openroot" in line.lower() or 'workdir' in line.lower()\
|
||||
or "error writing to file" in line.lower():
|
||||
elif 'volume.init' in lower_line or "openroot" in lower_line or 'workdir' in lower_line\
|
||||
or "error writing to file" in lower_line or "cannot open" in lower_line\
|
||||
or "cannot enter" in lower_line:
|
||||
#Also skip errors with the SD card
|
||||
pass
|
||||
elif 'unknown command' in line.lower():
|
||||
elif 'unknown command' in lower_line:
|
||||
#Ignore unkown command errors, it could be a typo or some missing feature
|
||||
pass
|
||||
elif not self.isError():
|
||||
|
|
|
|||
Loading…
Reference in a new issue