q3k
/
Printrun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #320 from colah/clean-monitor 

Clean up the monitor command.
master
kliment 2013-01-19 00:39:06 -08:00
parent 2a9433748c 3fb7a3e71c
commit c02e586533
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pronsole.py
View File

@ -1143,6 +1143,9 @@ class pronsole(cmd.Cmd):
if not self.p.online:
print "Printer is not online. Please connect first."
return
if not (self.p.printing or self.sdprinting):
print "Printer not printing. Please print something before monitoring."
return
print "Monitoring printer, use ^C to interrupt."
if len(l):
try:
@ -1151,22 +1154,27 @@ class pronsole(cmd.Cmd):
print "Invalid period given."
print "Updating values every %f seconds."%(interval,)
self.monitoring = 1
prev_msg_len = 0
try:
while(1):
while True:
self.p.send_now("M105")
if(self.sdprinting):
self.p.send_now("M27")
time.sleep(interval)
#print (self.tempreadings.replace("\r", "").replace("T", "Hotend").replace("B", "Bed").replace("\n", "").replace("ok ", ""))
if(self.p.printing):
print "Print progress: ", 100*float(self.p.queueindex)/len(self.p.mainqueue), "%"
if(self.sdprinting):
print "SD print progress: ", self.percentdone, "%"
except:
if self.p.printing:
preface = "Print progress: "
progress = 100*float(self.p.queueindex)/len(self.p.mainqueue)
elif self.sdprinting:
preface = "Print progress: "
progress = self.percentdone
progress = int(progress*10)/10.0 #limit precision
prev_msg = preface + str(progress) + "%"
sys.stdout.write("\r" + prev_msg.ljust(prev_msg_len))
sys.stdout.flush()
prev_msg_len = len(prev_msg)
except KeyboardInterrupt:
print "Done monitoring."
pass
self.monitoring = 0
def help_monitor(self):