Commit c527601f authored by kliment's avatar kliment

Merge pull request #321 from colah/clean-firmware-echo

Clean up echoed firmware lines, connect info.
parents c02e5865 14602469
...@@ -337,7 +337,7 @@ class pronsole(cmd.Cmd): ...@@ -337,7 +337,7 @@ class pronsole(cmd.Cmd):
return baselist+glob.glob('/dev/ttyUSB*') + glob.glob('/dev/ttyACM*') +glob.glob("/dev/tty.*")+glob.glob("/dev/cu.*")+glob.glob("/dev/rfcomm*") return baselist+glob.glob('/dev/ttyUSB*') + glob.glob('/dev/ttyACM*') +glob.glob("/dev/tty.*")+glob.glob("/dev/cu.*")+glob.glob("/dev/rfcomm*")
def online(self): def online(self):
print "Printer is now online" print "\rPrinter is now online"
sys.stdout.write(self.promptf()) sys.stdout.write(self.promptf())
sys.stdout.flush() sys.stdout.flush()
...@@ -899,7 +899,9 @@ class pronsole(cmd.Cmd): ...@@ -899,7 +899,9 @@ class pronsole(cmd.Cmd):
self.status.update_tempreading(l) self.status.update_tempreading(l)
tstring = l.rstrip() tstring = l.rstrip()
if(tstring!="ok" and not tstring.startswith("ok T") and not tstring.startswith("T:") and not self.listing and not self.monitoring): if(tstring!="ok" and not tstring.startswith("ok T") and not tstring.startswith("T:") and not self.listing and not self.monitoring):
print tstring if tstring[:5] == "echo:":
tstring = tstring[5:].lstrip()
print "\r" + tstring.ljust(15)
sys.stdout.write(self.promptf()) sys.stdout.write(self.promptf())
sys.stdout.flush() sys.stdout.flush()
for i in self.recvlisteners: for i in self.recvlisteners:
......
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