From 4d46653526d4847b7b2be491a177a7162ff951b8 Mon Sep 17 00:00:00 2001 From: Dimitris Zervas Date: Mon, 14 Sep 2020 04:02:40 +0300 Subject: [PATCH] Fix formatting and make lab68 bluetooth --- kmk/matrix.py | 28 ++++++++++++++++++++++++---- user_keymaps/dzervas/lab68.py | 9 ++++----- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/kmk/matrix.py b/kmk/matrix.py index 40c8890..dd35c62 100644 --- a/kmk/matrix.py +++ b/kmk/matrix.py @@ -46,12 +46,32 @@ class MatrixScanner: # https://github.com/adafruit/Adafruit_CircuitPython_MCP230xx/blob/3f04abbd65ba5fa938fcb04b99e92ae48a8c9406/adafruit_mcp230xx/digital_inout.py#L33 if self.diode_orientation == DiodeOrientation.COLUMNS: - 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.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 = [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.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 0dedc08..fa1c4aa 100644 --- a/user_keymaps/dzervas/lab68.py +++ b/user_keymaps/dzervas/lab68.py @@ -1,14 +1,13 @@ import board import busio - from digitalio import DigitalInOut, Direction, Pull + from adafruit_mcp230xx.mcp23017 import MCP23017 - -from kmk.kmk_keyboard import KMKKeyboard +from kmk.hid import HIDModes from kmk.keys import KC +from kmk.kmk_keyboard import KMKKeyboard from kmk.matrix import DiodeOrientation - # DEBUG_ENABLE = True i2c = busio.I2C(scl=board.SCL, sda=board.SDA, frequency=100000) @@ -71,4 +70,4 @@ keyboard.keymap = [ ] if __name__ == '__main__': - keyboard.go() + keyboard.go(hid_type=HIDModes.BLE)