diff --git a/CHANGELOG.md b/CHANGELOG.md index c8189893..d130a26d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -130,6 +130,7 @@ * Added deletion of `*.pyc` files to `python setup.py clean` command, should help tremendously when switching branches (backported from [9e014eb](https://github.com/foosel/OctoPrint/commit/9e014eba1feffde11ed0601d9c911b8cac9f3fb0)) * Increased default communication and connection timeouts +* [#706](https://github.com/foosel/OctoPrint/issues/706) - Do not truncate error reported from printer ### Bug Fixes @@ -137,8 +138,9 @@ by versioneer * [#679](https://github.com/foosel/OctoPrint/issues/679) - Fix error where API state is requested and printer is offline (backport of [619fe9a](https://github.com/foosel/OctoPrint/commit/619fe9a0e78826bd1524b235a910156439bcb6d7)). -* [IRC] - Don't hiccup on slic3r filament_diameter comments generated for multi extruder setups -* [ML] - Fixed relative URL to sockjs endpoint, wasn't yet using the proper base url +* [#719](https://github.com/foosel/OctoPrint/issues/719) - Properly center print bed in GCODE viewer +* [IRC] - Don't hiccup on slic3r ``filament_diameter`` comments generated for multi extruder setups +* [ML] - Fixed relative URL to SockJS endpoint, wasn't yet using the proper base url * [unreported] & [#698](https://github.com/foosel/OctoPrint/issues/698) - Generated URLs now take X-Forwarded-Host header sent by proxies into account for included host and port, also fixed [#698](https://github.com/foosel/OctoPrint/issues/698) introduced by this @@ -150,6 +152,8 @@ - [unreported] Synchronize image counter decrementing as well as incrementing to prevent rare race conditions when generating the image file names +([Commits](https://github.com/foosel/OctoPrint/compare/1.1.1...master)) + ## 1.1.1 (2014-10-27) ### Improvements diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index 1ba81bd8..f51154f9 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -262,18 +262,13 @@ class MachineCom(object): if self._state == self.STATE_CLOSED: return "Closed" if self._state == self.STATE_ERROR: - return "Error: %s" % (self.getShortErrorString()) + return "Error: %s" % (self.getErrorString()) if self._state == self.STATE_CLOSED_WITH_ERROR: - return "Error: %s" % (self.getShortErrorString()) + return "Error: %s" % (self.getErrorString()) if self._state == self.STATE_TRANSFERING_FILE: return "Transfering file to SD" return "?%d?" % (self._state) - def getShortErrorString(self): - if len(self._errorValue) < 20: - return self._errorValue - return self._errorValue[:20] + "..." - def getErrorString(self): return self._errorValue