Rename "Firmware" to "KeyboardConfig" for clarity in main.py and to illustrate separation of KeyboardConfig/InternalState

kmk/boards/converter/fourtypercentclub/gherkin.py

@@ -1,9 +1,9 @@
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     col_pins = (P.D9, P.D10, P.D11, P.D12, P.D13, P.SCL)
     row_pins = (P.A3, P.A4, P.A5, P.SCK, P.MOSI)
     diode_orientation = DiodeOrientation.COLUMNS

kmk/boards/converter/fourtypercentclub/luddite.py

@@ -1,11 +1,11 @@
 import board
 
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     col_pins = (P.A0, P.A1, P.A2, P.A3, P.A4, P.A5, P.SCK, P.MOSI)
     row_pins = (P.TX, P.RX, P.SDA, P.SCL, P.D13, P.D12, P.D11, P.D10)
     diode_orientation = DiodeOrientation.COLUMNS

kmk/boards/converter/keebio/bdn9.py

@@ -1,11 +1,11 @@
 import board
 
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     col_pins = (P.RX, P.D13, P.A0, P.D11, P.A4, P.A5, P.D10, P.D9, P.SCK)
     diode_orientation = DiodeOrientation.COLUMNS
     rgb_pixel_pin = board.TX

kmk/boards/converter/keebio/fourier.py

@@ -1,11 +1,11 @@
 import board
 
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     col_pins = (P.A1, P.A2, P.A3, P.A4, P.A5, P.SCK, P.MOSI)
     row_pins = (P.A0, P.D11, P.D10, P.D9)
     diode_orientation = DiodeOrientation.COLUMNS

kmk/boards/converter/keebio/iris_r1.py

@@ -1,11 +1,11 @@
 import board
 
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     col_pins = (P.A2, P.A3, P.A4, P.A5, P.SCK, P.MOSI)
     row_pins = (P.D11, P.D10, P.D9, P.D7, P.D13)
     diode_orientation = DiodeOrientation.COLUMNS

kmk/boards/converter/keebio/iris_r2.py

@@ -1,12 +1,12 @@
 import board
 
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 from kmk.util import intify_coordinate as ic
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     # Pin mappings for converter board found at hardware/README.md
     # QMK: MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
     # QMK: MATRIX_ROW_PINS { D7, E6, B4, D2, D4 }

kmk/boards/converter/keebio/lapace.py

@@ -1,11 +1,11 @@
 import board
 
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     col_pins = (P.SDA, P.A2, P.A3, P.A4, P.A5, P.SCK, P.MOSI)
     row_pins = (P.TX, P.A0, P.RX, P.A1, P.D11, P.D9, P.D12, P.D10)
     diode_orientation = DiodeOrientation.COLUMNS

kmk/boards/converter/keebio/levinson_r1.py

@@ -1,11 +1,11 @@
 import board
 
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     col_pins = (P.A2, P.A3, P.A4, P.A5, P.SCK, P.A0)
     row_pins = (P.D11, P.D10, P.D9, P.D7)
     diode_orientation = DiodeOrientation.COLUMNS

kmk/boards/converter/keebio/levinson_r2.py

@@ -1,11 +1,11 @@
 import board
 
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     col_pins = (P.A2, P.A3, P.A4, P.A5, P.SCK, P.MOSI)
     row_pins = (P.D13, P.D11, P.D10, P.D9)
     diode_orientation = DiodeOrientation.COLUMNS

kmk/boards/converter/keebio/nyquist_r1.py

@@ -1,11 +1,11 @@
 import board
 
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     col_pins = (P.A2, P.A3, P.A4, P.A5, P.SCK, P.MOSI)
     row_pins = (P.D13, P.D11, P.D10, P.D9, P.D7)
     diode_orientation = DiodeOrientation.COLUMNS

kmk/boards/converter/keebio/nyquist_r2.py

@@ -1,11 +1,11 @@
 import board
 
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     col_pins = (P.RX, P.A1, P.A2, P.A3, P.A4, P.A5)
     row_pins = (P.D13, P.D11, P.D10, P.D9, P.D7)
     diode_orientation = DiodeOrientation.COLUMNS

kmk/boards/converter/keebio/quefrency.py

@@ -1,11 +1,11 @@
 import board
 
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     # Will need additional work and testing
     col_pins = (P.A1, P.A2, P.A3, P.A4, P.A5, P.SCK, P.MOSI, P.D12)
     row_pins = (P.A0, P.D13, P.D11, P.D10, P.D9, P.D7)

kmk/boards/converter/keebio/rorschach.py

@@ -1,11 +1,11 @@
 import board
 
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     col_pins = (P.A2, P.A3, P.A4, P.A5, P.SCK, P.MOSI)
     row_pins = (P.D11, P.D10, P.D9, P.RX, P.D13)
     diode_orientation = DiodeOrientation.COLUMNS

kmk/boards/converter/keebio/tragicforce68.py

@@ -1,9 +1,9 @@
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     col_pins = (P.A0, P.A1, P.A2, P.A3, P.A4, P.A5, P.SCK, P.MOSI)
     row_pins = (P.TX, P.RX, P.SDA, P.SCL, P.D9, P.D10, P.D12, P.D11, P.D13)
     diode_orientation = DiodeOrientation.COLUMNS

kmk/boards/converter/keebio/viterbi_r1.py

@@ -1,11 +1,11 @@
 import board
 
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     col_pins = (P.A1, P.A2, P.A3, P.A4, P.A5, P.SCK, P.MOSI)
     row_pins = (P.D13, P.D11, P.D10, P.D9, P.D7)
     diode_orientation = DiodeOrientation.COLUMNS

kmk/boards/converter/keebio/viterbi_r2.py

@@ -1,11 +1,11 @@
 import board
 
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     col_pins = (P.A0, P.A1, P.A2, P.A3, P.A4, P.A5, P.SCK)
     row_pins = (P.D13, P.D11, P.D10, P.D9, P.D7)
     diode_orientation = DiodeOrientation.COLUMNS

kmk/boards/converter/lets-split/lets-split_r1.py

@@ -1,11 +1,11 @@
 import board
 
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     col_pins = (P.A5, P.A4, P.A3, P.A2, P.A1, P.A0)
     row_pins = (P.D7, P.D9, P.D10, P.D11)
     diode_orientation = DiodeOrientation.COLUMNS

kmk/boards/converter/lets-split/lets-split_r2.py

@@ -1,11 +1,11 @@
 import board
 
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     col_pins = (P.MOSI, P.SCK, P.A5, P.A4, P.A3, P.A2)
     row_pins = (P.D11, P.D10, P.D9, P.D7)
     diode_orientation = DiodeOrientation.COLUMNS

kmk/boards/klarank.py

@@ -1,9 +1,9 @@
 from kmk.consts import DiodeOrientation
-from kmk.mcus.circuitpython_usbhid import Firmware as _Firmware
+from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig
 from kmk.pins import Pin as P
 from kmk.util import intify_coordinate as ic
 
-# Implements what used to be handled by Firmware.swap_indicies for this
+# Implements what used to be handled by KeyboardConfig.swap_indicies for this
 # board, by flipping various row3 (bottom physical row) keys so their
 # coord_mapping matches what the user pressed (even if the wiring
 # underneath is sending different coordinates)
@@ -24,7 +24,7 @@ def r3_swap(col):
         return col
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     # physical, visible cols (SCK, MO, MI, RX, TX, D4)
     # physical, visible rows (10, 11, 12, 13) (9, 6, 5, SCL)
     col_pins = (P.SCK, P.MOSI, P.MISO, P.RX, P.TX, P.D4)

kmk/keyboard_config.py

@@ -53,7 +53,7 @@ from kmk.util import intify_coordinate as ic
 from kmk import led, rgb  # isort:skip
 
 
-class Firmware:
+class KeyboardConfig:
     debug_enabled = False
 
     keymap = None
@@ -95,7 +95,7 @@ class Firmware:
 
     def __repr__(self):
         return (
-            'Firmware('
+            'KeyboardConfig('
             'debug_enabled={} '
             'keymap=truncated '
             'coord_mapping=truncated '

kmk/mcus/circuitpython_usbhid.py

@@ -1,6 +1,6 @@
-from kmk.firmware import Firmware as _Firmware
 from kmk.hid import CircuitPythonUSB_HID
+from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
 
 
-class Firmware(_Firmware):
+class KeyboardConfig(_KeyboardConfig):
     hid_helper = CircuitPythonUSB_HID