self.comm.close()\r
return False\r
print line.rstrip()\r
- if line.startswith(replyStart):\r
+ if replyStart in line:\r
break\r
t.cancel()\r
return line.rstrip()\r
line = self.comm.readline()\r
if line == '':\r
return\r
- if line.startswith('start'):\r
+ if 'start' in line:\r
break\r
#Wait 3 seconds for the SD card init to timeout if we have SD in our firmware but there is no SD card found.\r
time.sleep(3)\r
self.heatButton.Enable(True)\r
self.extrudeButton.Enable(True)\r
return\r
- if line.startswith('start'):\r
+ if 'start' in line:\r
break\r
#Wait 3 seconds for the SD card init to timeout if we have SD in our firmware but there is no SD card found.\r
time.sleep(3)\r
self.feedrateRatioSupport = self.supportSpeedSelect.GetValue() / 100.0\r
\r
def AddTermLog(self, line):\r
- self.termLog.AppendText(line)\r
+ self.termLog.AppendText(unicode(line, 'utf-8', 'replace'))\r
\r
def OnTermEnterLine(self, e):\r
line = self.termInput.GetValue()\r
class VirtualPrinter():
def __init__(self):
- self.readList = ['start\n', 'Marlin: Virtual Marlin!\n']
+ self.readList = ['start\n', 'Marlin: Virtual Marlin!\n', '\x80\n']
self.temp = 0.0
self.targetTemp = 0.0
self.lastTempAt = time.time()
time.sleep(0.2)
starttime = time.time()
for line in ser:
- if line.startswith('start'):
+ if 'start' in line:
ser.close()
ser = Serial(port, baudrate, timeout=2)
ser.setDTR(1)
def readline(self):
if self.serial == None:
return None
- ret = self.serial.readline()
+ try:
+ ret = self.serial.readline()
+ except:
+ print "Unexpected error while reading serial port:", sys.exc_info()[0]
+ ret = ''
#if ret != '':
# print "Recv: " + ret.rstrip()
return ret