Commit bb2db1d4 authored by Guillaume Seguin's avatar Guillaume Seguin

Merge branch 'fixmonitor'

parents b54c8ba8 69a28f30
...@@ -238,6 +238,7 @@ class PronterWindow(MainWindow, pronsole.pronsole): ...@@ -238,6 +238,7 @@ class PronterWindow(MainWindow, pronsole.pronsole):
self.tempreport = "" self.tempreport = ""
self.userm114 = 0 self.userm114 = 0
self.userm105 = 0 self.userm105 = 0
self.m105_waitcycles = 0
self.monitor = 0 self.monitor = 0
self.fgcode = None self.fgcode = None
self.excluder = None self.excluder = None
...@@ -1483,7 +1484,9 @@ Printrun. If not, see <http://www.gnu.org/licenses/>.""" ...@@ -1483,7 +1484,9 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
if self.monitor and self.p.online: if self.monitor and self.p.online:
if self.sdprinting: if self.sdprinting:
self.p.send_now("M27") self.p.send_now("M27")
if self.m105_waitcycles % 10 == 0:
self.p.send_now("M105") self.p.send_now("M105")
self.m105_waitcycles += 1
cur_time = time.time() cur_time = time.time()
wait_time = 0 wait_time = 0
while time.time() < cur_time + self.monitor_interval - 0.25: while time.time() < cur_time + self.monitor_interval - 0.25:
...@@ -1524,6 +1527,7 @@ Printrun. If not, see <http://www.gnu.org/licenses/>.""" ...@@ -1524,6 +1527,7 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
if self.userm105 > 0: if self.userm105 > 0:
self.userm105 -= 1 self.userm105 -= 1
else: else:
self.m105_waitcycles = 0
isreport = True isreport = True
tstring = l.rstrip() tstring = l.rstrip()
if not self.p.loud and (tstring not in ["ok", "wait"] and not isreport): if not self.p.loud and (tstring not in ["ok", "wait"] and not isreport):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment