pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support serial hook handlers to not return written bytes

Browse source
This commit is contained in:
Gina Häußge 2016-07-29 00:13:03 +02:00
parent 444a36d0f0
commit 9b13eb8a6c
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/octoprint/util/comm.py
View file

@ -2036,11 +2036,21 @@ class MachineCom(object):
old_written = written
try:
written += self._serial.write(to_send)
result = self._serial.write(to_send)
if result is None or not isinstance(result, int):
# probably some plugin not returning the written bytes, assuming all of them
written += len(cmd)
else:
written += result
except serial.SerialTimeoutException:
self._log("Serial timeout while writing to serial port, trying again.")
try:
written += self._serial.write(to_send)
result = self._serial.write(to_send)
if result is None or not isinstance(result, int):
# probably some plugin not returning the written bytes, assuming all of them
written += len(cmd)
else:
written += result
except:
if not self._connection_closing:
self._logger.exception("Unexpected error while writing to serial port")