Commit cb3df1c4 authored by Ilya Novoselov's avatar Ilya Novoselov

Don't check for E: in temperature report.

Repetier firmware doesn't have that, but otherwise works.
parent 5c451301
...@@ -61,7 +61,6 @@ from printrun import gcoder ...@@ -61,7 +61,6 @@ from printrun import gcoder
tempreport_exp = re.compile("([TB]\d*):([-+]?\d*\.?\d*)(?: ?\/)?([-+]?\d*\.?\d*)") tempreport_exp = re.compile("([TB]\d*):([-+]?\d*\.?\d*)(?: ?\/)?([-+]?\d*\.?\d*)")
tempreading_exp = re.compile("(^T:| T:)") tempreading_exp = re.compile("(^T:| T:)")
extruderreading_exp = re.compile("(^E:| E:)")
def parse_temperature_report(report): def parse_temperature_report(report):
matches = tempreport_exp.findall(report) matches = tempreport_exp.findall(report)
...@@ -1483,7 +1482,7 @@ Printrun. If not, see <http://www.gnu.org/licenses/>.""" ...@@ -1483,7 +1482,7 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
self.userm114 -= 1 self.userm114 -= 1
else: else:
isreport = True isreport = True
if "ok T:" in l or (tempreading_exp.findall(l) and extruderreading_exp.findall(l)): if "ok T:" in l or tempreading_exp.findall(l):
self.tempreport = l self.tempreport = l
wx.CallAfter(self.tempdisp.SetLabel, self.tempreport.strip().replace("ok ", "")) wx.CallAfter(self.tempdisp.SetLabel, self.tempreport.strip().replace("ok ", ""))
self.update_tempdisplay() self.update_tempdisplay()
......
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