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

Merge branch 'master' into experimental

master
Kliment Yanev 2011-11-27 17:34:09 +01:00
parent 97af7725d9 f7e14bf772
commit 244350fee1
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
printcore.py
View File

@ -1,6 +1,7 @@
#!/usr/bin/env python
from serial import Serial
from threading import Thread
from select import error as SelectError
import time
import sys
@ -76,7 +77,15 @@ class printcore():
while(True):
if(not self.printer or not self.printer.isOpen):
break
line=self.printer.readline()
try:
line=self.printer.readline()
except SelectError, e:
if 'Bad file descriptor' in e.args[1]:
print "Can't read from printer (disconnected?)."
break
else:
raise
if(len(line)>1):
self.log+=[line]
if self.recvcb is not None:

6
pronsole.py
View File

@ -94,7 +94,7 @@ def estimate_duration(g):
feedrate = 0
X_last_position = 0
Y_last_position = 0
for i in g:
for i.split(";")[0] in g:
if "G1" in i and ("X" in i or "Y" in i or "F" in i or "E" in i):
parts = i.split(" ")
X = get_coordinate_value("X", parts[1:])
@ -812,14 +812,14 @@ class pronsole(cmd.Cmd):
print "! os.listdir('.')"
def default(self,l):
if(l[0]=='M' or l[0]=="G"):
if(l[0]=='M' or l[0]=="G" or l[0]=='T'):
if(self.p and self.p.online):
print "SENDING:"+l
self.p.send_now(l)
else:
print "Printer is not online."
return
if(l[0]=='m' or l[0]=="g"):
if(l[0]=='m' or l[0]=="g" or l[0]=='t'):
if(self.p and self.p.online):
print "SENDING:"+l.upper()
self.p.send_now(l.upper())