Commit dc4564d1 authored by Guillaume Seguin's avatar Guillaume Seguin

Uniformize tempreadings variable name

parent 9baa261b
...@@ -145,7 +145,7 @@ class PronterWindow(MainWindow, pronsole.pronsole): ...@@ -145,7 +145,7 @@ class PronterWindow(MainWindow, pronsole.pronsole):
self.status_thread = None self.status_thread = None
self.capture_skip = {} self.capture_skip = {}
self.capture_skip_newline = False self.capture_skip_newline = False
self.tempreport = "" self.tempreadings = ""
self.userm114 = 0 self.userm114 = 0
self.userm105 = 0 self.userm105 = 0
self.m105_waitcycles = 0 self.m105_waitcycles = 0
...@@ -1645,7 +1645,7 @@ Printrun. If not, see <http://www.gnu.org/licenses/>.""" ...@@ -1645,7 +1645,7 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
def update_tempdisplay(self): def update_tempdisplay(self):
try: try:
temps = parse_temperature_report(self.tempreport) temps = parse_temperature_report(self.tempreadings)
if "T0" in temps and temps["T0"][0]: if "T0" in temps and temps["T0"][0]:
hotend_temp = float(temps["T0"][0]) hotend_temp = float(temps["T0"][0])
elif "T" in temps and temps["T"][0]: elif "T" in temps and temps["T"][0]:
...@@ -1707,8 +1707,8 @@ Printrun. If not, see <http://www.gnu.org/licenses/>.""" ...@@ -1707,8 +1707,8 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
else: else:
isreport = True isreport = True
if "ok T:" in l or tempreading_exp.findall(l): if "ok T:" in l or tempreading_exp.findall(l):
self.tempreport = l self.tempreadings = l
wx.CallAfter(self.tempdisp.SetLabel, self.tempreport.strip().replace("ok ", "")) wx.CallAfter(self.tempdisp.SetLabel, self.tempreadings.strip().replace("ok ", ""))
self.update_tempdisplay() self.update_tempdisplay()
if self.userm105 > 0: if self.userm105 > 0:
self.userm105 -= 1 self.userm105 -= 1
......
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