From a0b43adc6123d3d0ae544abebb4ba237976c82e7 Mon Sep 17 00:00:00 2001 From: make-ing Date: Fri, 25 Sep 2015 10:03:26 +0200 Subject: [PATCH 1/3] change command test to only lowercase --- src/octoprint/util/comm_acc.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/octoprint/util/comm_acc.py b/src/octoprint/util/comm_acc.py index ce27b8cd..a72cbda0 100644 --- a/src/octoprint/util/comm_acc.py +++ b/src/octoprint/util/comm_acc.py @@ -478,7 +478,8 @@ class MachineCom(object): return if cmd[0] == "/": - if "toggleStatusReport" in cmd: + specialcmd = cmd[1:].lower() + if "togglestatusreport" in specialcmd: if self._temperature_timer is None: self._temperature_timer = RepeatedTimer(0.5, self._poll_temperature, run_first=True) self._temperature_timer.start() @@ -488,7 +489,7 @@ class MachineCom(object): else: self._log("Command not Found!") self._log("available commands are:") - self._log(" /toggleStatusReport") + self._log(" /togglestatusreport") return eepromCmd = re.search("^\$[0-9]+=.+$", cmd) From a1c40c7a41fcda20ccc3c82151800a0faddd28a2 Mon Sep 17 00:00:00 2001 From: make-ing Date: Fri, 25 Sep 2015 11:50:41 +0200 Subject: [PATCH 2/3] added setstatusfrequency special command --- src/octoprint/util/comm_acc.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/octoprint/util/comm_acc.py b/src/octoprint/util/comm_acc.py index a72cbda0..73b0945f 100644 --- a/src/octoprint/util/comm_acc.py +++ b/src/octoprint/util/comm_acc.py @@ -486,10 +486,23 @@ class MachineCom(object): else: self._temperature_timer.cancel() self._temperature_timer = None + if "setstatusfreqency" in specialcmd: + data = specialcmd.split(' ') + try: + frequency = float(data[1]) + except: + self._log("No frequency setting found! Using 1 sec.") + frequency = 1 + if self._temperature_timer is not None: + self._temperature_timer.cancel() + + self._temperature_timer = RepeatedTimer(frequency, self._poll_temperature, run_first=True) + self._temperature_timer.start() else: self._log("Command not Found!") self._log("available commands are:") self._log(" /togglestatusreport") + self._log(" /setstatusfreqency ") return eepromCmd = re.search("^\$[0-9]+=.+$", cmd) From 4f00f2768ccb409882c5932fa884095a8344d5d9 Mon Sep 17 00:00:00 2001 From: make-ing Date: Mon, 28 Sep 2015 11:36:32 +0200 Subject: [PATCH 3/3] fixed if else bug in specialcommand handling --- src/octoprint/util/comm_acc.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/octoprint/util/comm_acc.py b/src/octoprint/util/comm_acc.py index 73b0945f..504249c7 100644 --- a/src/octoprint/util/comm_acc.py +++ b/src/octoprint/util/comm_acc.py @@ -486,11 +486,11 @@ class MachineCom(object): else: self._temperature_timer.cancel() self._temperature_timer = None - if "setstatusfreqency" in specialcmd: + elif "setstatusfrequency" in specialcmd: data = specialcmd.split(' ') try: frequency = float(data[1]) - except: + except ValueError: self._log("No frequency setting found! Using 1 sec.") frequency = 1 if self._temperature_timer is not None: @@ -502,7 +502,7 @@ class MachineCom(object): self._log("Command not Found!") self._log("available commands are:") self._log(" /togglestatusreport") - self._log(" /setstatusfreqency ") + self._log(" /setstatusfrequency ") return eepromCmd = re.search("^\$[0-9]+=.+$", cmd)