Merge branch 'master' of github.com:kliment/Printrun
commit
f7e14bf772
11
printcore.py
11
printcore.py
|
@ -1,6 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
from serial import Serial
|
from serial import Serial
|
||||||
from threading import Thread
|
from threading import Thread
|
||||||
|
from select import error as SelectError
|
||||||
import time
|
import time
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
@ -76,7 +77,15 @@ class printcore():
|
||||||
while(True):
|
while(True):
|
||||||
if(not self.printer or not self.printer.isOpen):
|
if(not self.printer or not self.printer.isOpen):
|
||||||
break
|
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):
|
if(len(line)>1):
|
||||||
self.log+=[line]
|
self.log+=[line]
|
||||||
if self.recvcb is not None:
|
if self.recvcb is not None:
|
||||||
|
|
|
@ -809,14 +809,14 @@ class pronsole(cmd.Cmd):
|
||||||
print "! os.listdir('.')"
|
print "! os.listdir('.')"
|
||||||
|
|
||||||
def default(self,l):
|
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):
|
if(self.p and self.p.online):
|
||||||
print "SENDING:"+l
|
print "SENDING:"+l
|
||||||
self.p.send_now(l)
|
self.p.send_now(l)
|
||||||
else:
|
else:
|
||||||
print "Printer is not online."
|
print "Printer is not online."
|
||||||
return
|
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):
|
if(self.p and self.p.online):
|
||||||
print "SENDING:"+l.upper()
|
print "SENDING:"+l.upper()
|
||||||
self.p.send_now(l.upper())
|
self.p.send_now(l.upper())
|
||||||
|
|
Loading…
Reference in New Issue