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

paneldue: prevent reentry when processing incoming commands 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2020-12-09 19:18:52 -05:00
parent ec5be560d5
commit 59e58226ff
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
moonraker/plugins/paneldue.py
View File

@ -33,6 +33,8 @@ class SerialConnection:
self.partial_input = b"" self.partial_input = b""
self.ser = self.fd = None self.ser = self.fd = None
self.connected = False self.connected = False
self.busy = False
self.pending_lines = []
self.ioloop.spawn_callback(self._connect) self.ioloop.spawn_callback(self._connect)
def disconnect(self): def disconnect(self):
@ -86,25 +88,32 @@ class SerialConnection:
self.disconnect() self.disconnect()
logging.info("serial_display: No data received, disconnecting") logging.info("serial_display: No data received, disconnecting")
return return
self.ioloop.spawn_callback(self._process_data, data)
async def _process_data(self, data):
# Remove null bytes, separate into lines # Remove null bytes, separate into lines
data = data.strip(b'\x00') data = data.strip(b'\x00\xFF')
lines = data.split(b'\n') lines = data.split(b'\n')
lines[0] = self.partial_input + lines[0] lines[0] = self.partial_input + lines[0]
self.partial_input = lines.pop() self.partial_input = lines.pop()
for line in lines: self.pending_lines.extend(lines)
if self.busy:
return
self.busy = True
self.ioloop.spawn_callback(self._process_commands)
async def _process_commands(self):
while self.pending_lines:
line = self.pending_lines.pop(0)
line = line.strip().decode() line = line.strip().decode()
try: try:
await self.paneldue.process_line(line) await self.paneldue.process_line(line)
except ServerError: except ServerError:
logging.exception( logging.exception(
"GCode Processing Error: " + line) f"GCode Processing Error: {line}")
self.paneldue.handle_gcode_response( self.paneldue.handle_gcode_response(
"!! GCode Processing Error: " + line) f"!! GCode Processing Error: {line}")
except Exception: except Exception:
logging.exception("Error during gcode processing") logging.exception("Error during gcode processing")
self.busy = False
async def send(self, data): async def send(self, data):
if self.connected: if self.connected: