Commit 40742d31 authored by Guillaume Seguin's avatar Guillaume Seguin

Fix #584 (properly set isreport even for manual M105/M114)

parent b6c01059
...@@ -1193,17 +1193,16 @@ class pronsole(cmd.Cmd): ...@@ -1193,17 +1193,16 @@ class pronsole(cmd.Cmd):
if "ok C:" in l or "Count" in l \ if "ok C:" in l or "Count" in l \
or ("X:" in l and len(gcoder.m114_exp.findall(l)) == 6): or ("X:" in l and len(gcoder.m114_exp.findall(l)) == 6):
self.posreport = l self.posreport = l
isreport = REPORT_POS
if self.userm114 > 0: if self.userm114 > 0:
self.userm114 -= 1 self.userm114 -= 1
else:
isreport = REPORT_POS
if "ok T:" in l or tempreading_exp.findall(l): if "ok T:" in l or tempreading_exp.findall(l):
self.tempreadings = l self.tempreadings = l
isreport = REPORT_TEMP
if self.userm105 > 0: if self.userm105 > 0:
self.userm105 -= 1 self.userm105 -= 1
else: else:
self.m105_waitcycles = 0 self.m105_waitcycles = 0
isreport = REPORT_TEMP
return isreport return isreport
def recvcb(self, l): def recvcb(self, l):
...@@ -1214,7 +1213,7 @@ class pronsole(cmd.Cmd): ...@@ -1214,7 +1213,7 @@ class pronsole(cmd.Cmd):
for listener in self.recvlisteners: for listener in self.recvlisteners:
listener(l) listener(l)
if tstring != "ok" and not self.sdlisting \ if tstring != "ok" and not self.sdlisting \
and not self.monitoring and report_type == REPORT_NONE: and not self.monitoring and report_type == REPORT_NONE:
if tstring[:5] == "echo:": if tstring[:5] == "echo:":
tstring = tstring[5:].lstrip() tstring = tstring[5:].lstrip()
if self.silent is False: print "\r" + tstring.ljust(15) if self.silent is False: print "\r" + tstring.ljust(15)
......
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