sporq/kmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix keypad matrix init and unguarded debug print.

Browse Source
This commit is contained in:
xs5871 2022-02-27 17:49:39 +00:00 committed by Kyle Brown
parent 2008e0ab3f
commit 54ae022846
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kmk/kmk_keyboard.py
View File

@ -297,7 +297,8 @@ class KMKKeyboard:
def _init_matrix(self): def _init_matrix(self):
if self.matrix is None: if self.matrix is None:
print('Initialising matrix scanner from self.matrix_scanner') if self.debug_enabled:
print('Initialising matrix scanner from self.matrix_scanner')
self.matrix = self.matrix_scanner( self.matrix = self.matrix_scanner(
cols=self.col_pins, cols=self.col_pins,
rows=self.row_pins, rows=self.row_pins,
@ -307,7 +308,8 @@ class KMKKeyboard:
), ),
) )
else: else:
print('Matrix scanner already set, not overwriting.') if self.debug_enabled:
print('Matrix scanner already set, not overwriting.')
return self return self

4
kmk/scanners/native_keypad_scanner.py
View File

@ -42,7 +42,9 @@ def keypad_matrix(row_pins, col_pins, direction=DiodeOrientation.COLUMNS):
pin_map = [ pin_map = [
(row, col) for row in range(len(row_pins)) for col in range(len(col_pins)) (row, col) for row in range(len(row_pins)) for col in range(len(col_pins))
] ]
kp = keypad.KeyMatrix(row_pins, col_pins, direction == DiodeOrientation.COLUMNS) kp = keypad.KeyMatrix(
row_pins, col_pins, columns_to_anodes=(direction == DiodeOrientation.COLUMNS)
)
return NativeKeypadScanner(pin_map, kp) return NativeKeypadScanner(pin_map, kp)