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

buttons: Improve python3 compatibility 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-09-04 19:33:04 -04:00
parent 5cce7f4d55
commit 166ce06aea
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
klippy/extras/buttons.py
View File

@ -62,7 +62,7 @@ class MCU_buttons:
ack_diff -= 0x100 ack_diff -= 0x100
msg_ack_count = ack_count - ack_diff msg_ack_count = ack_count - ack_diff
# Determine new buttons # Determine new buttons
buttons = params['state'] buttons = bytearray(params['state'])
new_count = msg_ack_count + len(buttons) - self.ack_count new_count = msg_ack_count + len(buttons) - self.ack_count
if new_count <= 0: if new_count <= 0:
return return
@ -71,9 +71,9 @@ class MCU_buttons:
self.ack_cmd.send([self.oid, new_count]) self.ack_cmd.send([self.oid, new_count])
self.ack_count += new_count self.ack_count += new_count
# Call self.handle_button() with this event in main thread # Call self.handle_button() with this event in main thread
for b in new_buttons: for nb in new_buttons:
self.reactor.register_async_callback( self.reactor.register_async_callback(
(lambda e, s=self, b=ord(b): s.handle_button(e, b))) (lambda e, s=self, b=nb: s.handle_button(e, b)))
def handle_button(self, eventtime, button): def handle_button(self, eventtime, button):
button ^= self.invert button ^= self.invert
changed = button ^ self.last_button changed = button ^ self.last_button