From b082f26d9e7e39de2ed5288e9680087d0398a05e Mon Sep 17 00:00:00 2001 From: Dimitris Zervas Date: Mon, 14 Sep 2020 02:19:46 +0300 Subject: [PATCH] Fix typos in lab68 and add compatibility for MCP to matrix --- kmk/matrix.py | 12 ++++++++---- user_keymaps/dzervas/lab68.py | 26 ++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/kmk/matrix.py b/kmk/matrix.py index 26b83a2..40c8890 100644 --- a/kmk/matrix.py +++ b/kmk/matrix.py @@ -41,13 +41,17 @@ class MatrixScanner: self.diode_orientation = diode_orientation + # __class__.__name__ is used instead of isinstance as the MCP230xx lib + # does not use the digitalio.DigitalInOut, but rather a self defined one: + # https://github.com/adafruit/Adafruit_CircuitPython_MCP230xx/blob/3f04abbd65ba5fa938fcb04b99e92ae48a8c9406/adafruit_mcp230xx/digital_inout.py#L33 + if self.diode_orientation == DiodeOrientation.COLUMNS: - self.outputs = [digitalio.DigitalInOut(x) for x in cols] - self.inputs = [digitalio.DigitalInOut(x) for x in rows] + self.outputs = [x if x.__class__.__name__ is "DigitalInOut" else digitalio.DigitalInOut(x) for x in cols] + self.inputs = [x if x.__class__.__name__ is "DigitalInOut" else digitalio.DigitalInOut(x) for x in rows] self.translate_coords = True elif self.diode_orientation == DiodeOrientation.ROWS: - self.outputs = [digitalio.DigitalInOut(x) for x in rows] - self.inputs = [digitalio.DigitalInOut(x) for x in cols] + self.outputs = [x if x.__class__.__name__ is "DigitalInOut" else digitalio.DigitalInOut(x) for x in rows] + self.inputs = [x if x.__class__.__name__ is "DigitalInOut" else digitalio.DigitalInOut(x) for x in cols] self.translate_coords = False else: raise ValueError( diff --git a/user_keymaps/dzervas/lab68.py b/user_keymaps/dzervas/lab68.py index 3b41654..0dedc08 100644 --- a/user_keymaps/dzervas/lab68.py +++ b/user_keymaps/dzervas/lab68.py @@ -1,6 +1,18 @@ -from kmk.boards.converter.keebio.nyquist_r2 import KMKKeyboard -from kmk.keys import KC +import board +import busio +from digitalio import DigitalInOut, Direction, Pull +from adafruit_mcp230xx.mcp23017 import MCP23017 + +from kmk.kmk_keyboard import KMKKeyboard +from kmk.keys import KC +from kmk.matrix import DiodeOrientation + + +# DEBUG_ENABLE = True + +i2c = busio.I2C(scl=board.SCL, sda=board.SDA, frequency=100000) +mcp = MCP23017(i2c, address=0x20) keyboard = KMKKeyboard() _______ = KC.TRNS @@ -8,6 +20,12 @@ XXXXXXX = KC.NO FN = KC.MO(1) +keyboard.debug_enabled = True + +keyboard.col_pins = (mcp.get_pin(0), mcp.get_pin(1), mcp.get_pin(2), mcp.get_pin(3), mcp.get_pin(4), mcp.get_pin(5), mcp.get_pin(5), mcp.get_pin(6), mcp.get_pin(7), mcp.get_pin(8), mcp.get_pin(9), mcp.get_pin(10), mcp.get_pin(11), mcp.get_pin(12), mcp.get_pin(13), mcp.get_pin(14)) +keyboard.row_pins = (board.D7, board.D6, board.D5, board.D3, board.D2) +keyboard.diode_orientation = DiodeOrientation.COLUMNS + keyboard.keymap = [ # Qwerty # ,--------------------------------------------------------------------------------------------------------. @@ -26,7 +44,7 @@ keyboard.keymap = [ KC.TAB, KC.Q, KC.W, KC.E, KC.R, KC.T, KC.Y, KC.U, KC.I, KC.O, KC.P, KC.LBRC, KC.RBRC, KC.BSLASH, KC.PGUP, KC.ESC, KC.A, KC.S, KC.D, KC.F, KC.G, KC.H, KC.J, KC.K, KC.L, KC.SCLN, KC.QUOT, XXXXXXX, KC.ENTER, KC.PGDN, KC.LSFT, KC.Z, KC.X, KC.C, KC.V, KC.B, KC.N, KC.M, KC.COMM, KC.DOT, KC.SLSH, KC.RSFT, XXXXXXX, KC.UP, KC.INS, - KC.LCTL, KC.LGUI, KC.LALT, XXXXXXX, XXXXXXX, KC.SPC, XXXXXXX, XXXXXXX, FN, KC.ALT, KC.RCTL, KC.LEFT, XXXXXXX, KC.DOWN, KC.RIGHT, + KC.LCTL, KC.LGUI, KC.LALT, XXXXXXX, XXXXXXX, KC.SPC, XXXXXXX, XXXXXXX, FN, KC.RALT, KC.RCTL, KC.LEFT, XXXXXXX, KC.DOWN, KC.RIGHT, ], @@ -48,7 +66,7 @@ keyboard.keymap = [ KC.TAB, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC.PSCR, XXXXXXX, KC.PAUSE, _______, XXXXXXX, _______, KC.ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, KC.LSFT, XXXXXXX, KC.MPLY, KC.MSTP, KC.MPRV, KC.MNXT, KC.VOLD, KC.VOLU, KC.MUTE, XXXXXXX, XXXXXXX, KC.RSFT, XXXXXXX, _______, XXXXXXX, - KC.LCTL, KC.LGUI, KC.LALT, XXXXXXX, XXXXXXX, KC.SPC, XXXXXXX, XXXXXXX, FN, KC.ALT, KC.RCTL, _______, XXXXXXX, _______, _______, + KC.LCTL, KC.LGUI, KC.LALT, XXXXXXX, XXXXXXX, KC.SPC, XXXXXXX, XXXXXXX, FN, KC.RALT, KC.RCTL, _______, XXXXXXX, _______, _______, ], ]