Removed curr_event and simplified scan_for_changes

This commit is contained in:
Steven Wilde 2022-05-04 00:56:11 -05:00 committed by xs5871
parent f2b8c7106e
commit 29abba63e7

View File

@ -11,9 +11,6 @@ class KeypadScanner(Scanner):
:param kp: An instance of the keypad class. :param kp: An instance of the keypad class.
''' '''
def __init__(self):
self.curr_event = keypad.Event()
@property @property
def key_count(self): def key_count(self):
return self.keypad.key_count return self.keypad.key_count
@ -24,13 +21,10 @@ class KeypadScanner(Scanner):
The key report is a byte array with contents [row, col, True if pressed else False] The key report is a byte array with contents [row, col, True if pressed else False]
''' '''
ev = self.curr_event ev = self.keypad.events.get()
has_event = self.keypad.events.get_into(ev) if ev and self.offset:
if has_event: return keypad.Event(ev.key_number + self.offset, ev.pressed)
if self.offset: return ev
return keypad.Event(ev.key_number + self.offset, ev.pressed)
else:
return keypad.Event(ev.key_number, ev.pressed)
class MatrixScanner(KeypadScanner): class MatrixScanner(KeypadScanner):