From f6acca5db2d1c1652d3e9c13763c37137cf98711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 3 Sep 2015 18:02:46 +0200 Subject: [PATCH] Set default value for temperature polling when target is set to 2s 1s might be a bit fast as a default for certain boards, so better leave it at something less spammy. --- src/octoprint/settings.py | 2 +- src/octoprint/util/comm.py | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py index e23980e4..666012af 100644 --- a/src/octoprint/settings.py +++ b/src/octoprint/settings.py @@ -80,7 +80,7 @@ default_settings = { "connection": 10, "communication": 30, "temperature": 5, - "temperatureTargetSet": 1, + "temperatureTargetSet": 2, "sdStatus": 1 }, "additionalPorts": [], diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index bf3ae0ae..fd2042d2 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -1271,17 +1271,20 @@ class MachineCom(object): self.sendGcodeScript("afterPrinterConnected", replacements=dict(event=payload)) def _getTemperatureTimerInterval(self): + busy_default = 4.0 + target_default = 2.0 + if self.isBusy(): - return get_interval("temperature", default_value=4.0) + return get_interval("temperature", default_value=busy_default) for temp in [self._temp[k][1] for k in self._temp.keys()]: if temp > self._temperatureTargetSetThreshold: - return get_interval("temperatureTargetSet", default_value=1.0) + return get_interval("temperatureTargetSet", default_value=target_default) if self._bedTemp and len(self._bedTemp) > 0 and self._bedTemp[1] > self._temperatureTargetSetThreshold: - return get_interval("temperatureTargetSet", default_value=1.0) + return get_interval("temperatureTargetSet", default_value=target_default) - return get_interval("temperature", default_value=4.0) + return get_interval("temperature", default_value=busy_default) def _sendFromQueue(self): if not self._commandQueue.empty() and not self.isStreaming():