3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gcode: Catch errors on fd read and write 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-09-12 18:27:33 -04:00
parent d1da6100a6
commit 91691afdcf
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
klippy/gcode.py
View File

@ -183,7 +183,11 @@ class GCodeParser:
m112_r = re.compile('^(?:[nN][0-9]+)?\s*[mM]112(?:\s|$)') m112_r = re.compile('^(?:[nN][0-9]+)?\s*[mM]112(?:\s|$)')
def process_data(self, eventtime): def process_data(self, eventtime):
# Read input, separate by newline, and add to pending_commands # Read input, separate by newline, and add to pending_commands
data = os.read(self.fd, 4096) try:
data = os.read(self.fd, 4096)
except os.error:
logging.exception("Read g-code")
return
self.input_log.append((eventtime, data)) self.input_log.append((eventtime, data))
self.bytes_read += len(data) self.bytes_read += len(data)
lines = data.split('\n') lines = data.split('\n')
@ -256,15 +260,21 @@ class GCodeParser:
def ack(self, msg=None): def ack(self, msg=None):
if not self.need_ack or self.is_fileinput: if not self.need_ack or self.is_fileinput:
return return
if msg: try:
os.write(self.fd, "ok %s\n" % (msg,)) if msg:
else: os.write(self.fd, "ok %s\n" % (msg,))
os.write(self.fd, "ok\n") else:
os.write(self.fd, "ok\n")
except os.error:
logging.exception("Write g-code ack")
self.need_ack = False self.need_ack = False
def respond(self, msg): def respond(self, msg):
if self.is_fileinput: if self.is_fileinput:
return return
os.write(self.fd, msg+"\n") try:
os.write(self.fd, msg+"\n")
except os.error:
logging.exception("Write g-code response")
def respond_info(self, msg): def respond_info(self, msg):
logging.debug(msg) logging.debug(msg)
lines = [l.strip() for l in msg.strip().split('\n')] lines = [l.strip() for l in msg.strip().split('\n')]