pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set default value for temperature polling when target is set to 2s

Browse source 
1s might be a bit fast as a default for certain boards, so better leave it at
something less spammy.
This commit is contained in:
Gina Häußge 2015-09-03 18:02:46 +02:00
parent 24f769ff80
commit f6acca5db2
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/octoprint/settings.py
View file

@ -80,7 +80,7 @@ default_settings = {
"connection": 10,
"communication": 30,
"temperature": 5,
"temperatureTargetSet": 1,
"temperatureTargetSet": 2,
"sdStatus": 1
},
"additionalPorts": [],

11
src/octoprint/util/comm.py
View file

@ -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():