From 3ac2d5dd346979366c10187ae16faea93f615f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 26 May 2015 18:46:50 +0200 Subject: [PATCH] Fixed Z-Timelapse for Z changes on ``G1`` moves Solves #909 --- CHANGELOG.md | 1 + src/octoprint/timelapse.py | 2 +- src/octoprint/util/comm.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a444e79..220ac380 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -183,6 +183,7 @@ * [#809](https://github.com/foosel/OctoPrint/issues/809) - Added proper form validation to printer profile editor * [#824](https://github.com/foosel/OctoPrint/issues/824) - Settings getting lost when switching between panes in the settings dialog (fix provided by [#879](https://github.com/foosel/OctoPrint/pull/879)) + * [#909](https://github.com/foosel/OctoPrint/issues/909) - Fixed Z-Timelapse for Z changes on ``G1`` moves. * Various fixes without tickets: * GCODE viewer now doesn't stumble over completely extrusionless GCODE files * Do not deliver the API key on settings API unless user has admin rights diff --git a/src/octoprint/timelapse.py b/src/octoprint/timelapse.py index 11882bfc..0d638ad9 100644 --- a/src/octoprint/timelapse.py +++ b/src/octoprint/timelapse.py @@ -349,7 +349,7 @@ class ZTimelapse(Timelapse): def eventSubscriptions(self): return [ - ("ZChange", self._onZChange) + (Events.Z_CHANGE, self._onZChange) ] def configData(self): diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index 5ecdd78f..e54c947f 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -1612,7 +1612,7 @@ class MachineCom(object): except ValueError: pass return cmd - _gcode_G0_sent = _gcode_G0_sent + _gcode_G1_sent = _gcode_G0_sent def _gcode_M0_queue(self, cmd): self.setPause(True)