port boards and docs

boards/boardsource/3x4/main.py

@@ -1,6 +1,6 @@
 from kb import KMKKeyboard
-from kmk.extensions.layers import Layers
 from kmk.keys import KC
+from kmk.modules.layers import Layers
 
 keyboard = KMKKeyboard()
 
@@ -8,10 +8,10 @@ keyboard = KMKKeyboard()
 _______ = KC.TRNS
 XXXXXXX = KC.NO
 
-RAISE = KC.MO(1)
 layers_ext = Layers()
+keyboard.modules = [layers_ext]
 
-keyboard.extensions = [layers_ext]
+RAISE = KC.MO(1)
 
 keyboard.keymap = [
     [  #Base

boards/boardsource/4x12/main.py

@@ -1,10 +1,16 @@
 from kb import KMKKeyboard
-from kmk.extensions.layers import Layers
 from kmk.extensions.media_keys import MediaKeys
 from kmk.keys import KC
+from kmk.modules.layers import Layers
 
 keyboard = KMKKeyboard()
 
+media = MediaKeys()
+layers_ext = Layers()
+
+keyboard.extensions = [media]
+keyboard.modules = [layers_ext]
+
 # Cleaner key names
 _______ = KC.TRNS
 XXXXXXX = KC.NO
@@ -12,11 +18,6 @@ XXXXXXX = KC.NO
 LOWER = KC.MO(1)
 RAISE = KC.MO(2)
 
-media = MediaKeys()
-layers_ext = Layers()
-
-keyboard.extensions = [layers_ext, media]
-
 keyboard.keymap = [
     [  #QWERTY
         KC.TAB,  KC.Q,    KC.W,    KC.E,    KC.R,    KC.T,    KC.Y,    KC.U,    KC.I,    KC.O,    KC.P,    KC.BSPC,

boards/boardsource/5x12/main.py

@@ -1,10 +1,16 @@
 from kb import KMKKeyboard
-from kmk.extensions.layers import Layers
 from kmk.extensions.media_keys import MediaKeys
 from kmk.keys import KC
+from kmk.modules.layers import Layers
 
 keyboard = KMKKeyboard()
 
+media = MediaKeys()
+layers_ext = Layers()
+
+keyboard.modules = [layers_ext]
+keyboard.extensions = [media]
+
 # Cleaner key names
 _______ = KC.TRNS
 XXXXXXX = KC.NO
@@ -12,11 +18,6 @@ XXXXXXX = KC.NO
 LOWER = KC.MO(1)
 RAISE = KC.MO(2)
 
-media = MediaKeys()
-layers_ext = Layers()
-
-extensions = [layers_ext, media]
-
 keyboard.keymap = [
     [  #QWERTY
         KC.GRV,  KC.N1,   KC.N2,   KC.N3,   KC.N4,   KC.N5,   KC.N6,   KC.N7,   KC.N8,   KC.N9,   KC.N0,   KC.BSPC,

boards/boardsource/microdox/main.py

@@ -1,10 +1,19 @@
 from kb import KMKKeyboard
-from kmk.extensions.ble_split import BLE_Split
-from kmk.extensions.layers import Layers
 from kmk.keys import KC
+from kmk.modules.layers import Layers
+from kmk.modules.split import Split, SplitSide, SplitType
 
 keyboard = KMKKeyboard()
 
+# TODO Comment one of these on each side
+split_side = SplitSide.LEFT
+split_side = SplitSide.RIGHT
+split = Split(split_type=SplitType.BLE, split_side=split_side)
+
+layers_ext = Layers()
+
+keyboard.modules = [layers_ext, split]
+
 # Cleaner key names
 _______ = KC.TRNS
 XXXXXXX = KC.NO
@@ -20,16 +29,6 @@ RGB_SAD = KC.RGB_SAD
 RGB_VAI = KC.RGB_VAI
 RGB_VAD = KC.RGB_VAD
 
-# TODO Comment one of these on each side
-# Left is 0, Right is 1
-split_side = 0
-split_side = 1
-split = BLE_Split(split_side=split_side)
-
-layers_ext = Layers()
-
-keyboard.extensions = [layers_ext, split]
-
 keyboard.keymap = [
     [  #QWERTY
         KC.Q,    KC.W,    KC.E,    KC.R,    KC.T,                         KC.Y,    KC.U,    KC.I,    KC.O,   KC.P,\

boards/crkbd/main.py

@@ -2,14 +2,17 @@ from kb import KMKKeyboard, rgb_pixel_pin
 from kmk.extensions.rgb import RGB
 from kmk.keys import KC
 from kmk.modules.layers import Layers
-from kmk.modules.split import Split, SplitType
+from kmk.modules.split import Split, SplitSide, SplitType
 
 keyboard = KMKKeyboard()
 
 # Adding extentions
 rgb = RGB(pixel_pin=rgb_pixel_pin, num_pixels=27, val_limit=100, hue_default=190, sat_default=100, val_default=5)
 
-split = Split(split_type=SplitType.BLE)
+# TODO Comment one of these on each side
+split_side = SplitSide.LEFT
+split_side = SplitSide.RIGHT
+split = Split(split_type=SplitType.BLE, split_side=split_side)
 
 layers_ext = Layers()
 

boards/ergo_travel/main.py

@@ -1,11 +1,21 @@
 from kb import KMKKeyboard
-from kmk.extensions.ble_split import BLE_Split
-from kmk.extensions.layers import Layers
 from kmk.extensions.media_keys import MediaKeys
 from kmk.keys import KC
+from kmk.modules.layers import Layers
+from kmk.modulessplit import Split, SplitSide, SplitType
 
 keyboard = KMKKeyboard()
 
+# TODO Comment one of these on each side
+split_side = SplitSide.LEFT
+split_side = SplitSide.RIGHT
+split = Split(split_type=SplitType.BLE, split_side=split_side)
+
+media = MediaKeys()
+layers_ext = Layers()
+keyboard.modules = [layers_ext, split]
+keyboard.extensions = (media)
+
 # Cleaner key names
 _______ = KC.TRNS
 XXXXXXX = KC.NO
@@ -17,17 +27,6 @@ ADJUST = KC.MO(3)
 CALTDEL = KC.LCTL(KC.LALT(KC.DEL))
 TSKMGR = KC.LCTL(KC.LSFT(KC.KC_ESC))
 
-# TODO Comment one of these on each side
-# Left is 0, Right is 1
-split_side = 0
-split_side = 1
-split = BLE_Split(split_side=split_side)
-
-media = MediaKeys()
-layers_ext = Layers()
-
-extensions = [layers_ext, media]
-
 keyboard.keymap = [
     [  #QWERTY
         KC.ESC,  KC.Q,    KC.W,    KC.E,    KC.R,    KC.T,    KC.MINS,          KC.EQL,   KC.Y,    KC.U,    KC.I,    KC.O,    KC.P,    KC.BSPC,\

boards/fourtypercentclub/gherkin/main.py

@@ -1,11 +1,18 @@
 from kb import KMKKeyboard
-from kmk.extensions.layers import Layers
 from kmk.extensions.led import LED
-from kmk.extensions.modtap import ModTap
 from kmk.keys import KC
+from kmk.modules.layers import Layers
+from kmk.modules.modtap import ModTap
 
 keyboard = KMKKeyboard()
 
+
+modtap = ModTap()
+layers_ext = Layers()
+led = LED()
+keyboard.extensions = [led]
+keyboard.modules = [layers_ext, modtap]
+
 # Cleaner key names
 _______ = KC.TRNS
 XXXXXXX = KC.NO
@@ -23,11 +30,6 @@ SFT_ENT = KC.SFT(KC.ENT)
 BL_DEC = KC.BL_DEC
 BL_INC = KC.BL_INC
 
-modtap = ModTap()
-layers_ext = Layers()
-led = LED()
-keyboard.extensions = [layers_ext, led, modtap]
-
 keyboard.keymap = [
     [
         KC.Q,    KC.W,    KC.E,    KC.R,   KC.T,     KC.Y,    KC.U,    KC.I,    KC.O,    KC.P,

boards/fourtypercentclub/luddite/main.py

@@ -1,8 +1,8 @@
 from kb import KMKKeyboard
-from kmk.extensions.layers import Layers
 from kmk.extensions.led import LED
 from kmk.extensions.rgb import RGB
 from kmk.keys import KC
+from kmk.modules.layers import Layers
 
 keyboard = KMKKeyboard()
 
@@ -12,7 +12,8 @@ XXXXXXX = KC.NO
 rgb_ext = RGB(pixel_pin=keyboard.rgb_pixel_pin, num_pixels=keyboard.rgb_num_pixels)
 led = LED()
 layers_ext = Layers()
-keyboard.extensions = [rgb_ext, led, layers_ext]
+keyboard.extensions = [rgb_ext, led]
+keyboard.modules = [layers_ext]
 
 BASE = 0
 FN1 = 1

boards/keebio/iris/kb_converter.py

@@ -16,8 +16,8 @@ class KMKKeyboard(_KMKKeyboard):
     split_flip = True
     split_offsets = (6, 6, 6, 6, 6)
     split_type = 'UART'
-    uart_pin = board.SCL
-    extra_data_pin = board.SDA
+    data_pin = board.SCL
+    data_pin2 = board.SDA
     rgb_num_pixels = 12
     i2c = board.I2C
     rgb_pixel_pin = board.TX

boards/keebio/iris/main.py

@@ -1,11 +1,11 @@
 from kb import KMKKeyboard
 from kmk.consts import UnicodeMode
-from kmk.extensions.ble_split import BLE_Split
-from kmk.extensions.layers import Layers
 from kmk.extensions.rgb import RGB
 from kmk.handlers.sequences import compile_unicode_string_sequences as cuss
 from kmk.handlers.sequences import send_string
 from kmk.keys import KC
+from kmk.modules.layers import Layers
+from kmk.modules.split import Split, SplitSide, SplitType
 
 keyboard = KMKKeyboard()
 
@@ -57,14 +57,14 @@ HELLA_TD = KC.TD(
 
 rgb_ext = RGB(pixel_pin=keyboard.rgb_pixel_pin, num_pixels=keyboard.rgb_num_pixels)
 layers_ext = Layers()
-#
-# TODO Comment one of these on each side
-# Left is 0, Right is 1
-split_side = 0
-split_side = 1
-split = BLE_Split(split_side=split_side)
 
-extensions = [rgb_ext, split, layers_ext]
+# TODO Comment one of these on each side
+split_side = SplitSide.LEFT
+split_side = SplitSide.RIGHT
+split = Split(split_type=SplitType.BLE, split_side=split_side)
+
+keyboard.extensions = [rgb_ext]
+keyboard.modules = [split, layers_ext]
 
 
 keyboard.keymap = [

boards/keebio/levinson/kb_converter.py

@@ -12,7 +12,7 @@ class KMKKeyboard(_KMKKeyboard):
     split_type = 'UART'
     split_flip = True
     split_offsets = [6, 6, 6, 6, 6]
-    uart_pin = board.SCL
-    extra_data_pin = board.SDA
+    data_pin = board.SCL
+    data_pin2 = board.SDA
     rgb_pixel_pin = board.TX
     led_pin = board.D7

boards/keebio/levinson/main.py

@@ -1,11 +1,21 @@
 from kb import KMKKeyboard
-from kmk.extensions.ble_split import BLE_Split
-from kmk.extensions.layers import Layers
 from kmk.extensions.rgb import RGB
 from kmk.keys import KC
+from kmk.modules.layers import Layers
+from kmk.modules.split import Split, SplitSide, SplitType
 
 keyboard = KMKKeyboard()
 
+rgb_ext = RGB(pixel_pin=keyboard.rgb_pixel_pin, num_pixels=keyboard.rgb_num_pixels)
+layers_ext = Layers()
+# TODO Comment one of these on each side
+split_side = SplitSide.LEFT
+split_side = SplitSide.RIGHT
+split = Split(split_type=SplitType.BLE, split_side=split_side)
+
+keyboard.extensions = [rgb_ext]
+keyboard.modules = [layers_ext, split]
+
 _______ = KC.TRNS
 XXXXXXX = KC.NO
 
@@ -13,17 +23,6 @@ LOWER = KC.MO(3)
 RAISE = KC.MO(4)
 ADJUST = KC.MO(5)
 
-rgb_ext = RGB(pixel_pin=keyboard.rgb_pixel_pin, num_pixels=keyboard.rgb_num_pixels)
-layers_ext = Layers()
-#
-# TODO Comment one of these on each side
-# Left is 0, Right is 1
-split_side = 0
-split_side = 1
-split = BLE_Split(split_side=split_side)
-
-keyboard.extensions = [rgb_ext, layers_ext, split]
-
 keyboard.keymap = [
     # Qwerty
     # ,-----------------------------------------------------------------------------------.

boards/keebio/nyquist/kb_converter.py

@@ -11,7 +11,7 @@ class KMKKeyboard(_KMKKeyboard):
 
     split_type = 'UART'
     split_flip = True
-    uart_pin = board.SCL
+    data_pin = board.SCL
     rgb_num_pixels = 12
     rgb_pixel_pin = board.TX
-    extra_data_pin = board.SDA
+    data_pin2 = board.SDA

boards/keebio/nyquist/main.py

@@ -1,11 +1,22 @@
 from kb import KMKKeyboard
-from kmk.extensions.ble_split import BLE_Split
-from kmk.extensions.layers import Layers
 from kmk.extensions.rgb import RGB
 from kmk.keys import KC
+from kmk.modules.layers import Layers
+from kmk.modules.split import Split, SplitSide, SplitType
 
 keyboard = KMKKeyboard()
 
+rgb_ext = RGB(pixel_pin=keyboard.rgb_pixel_pin, num_pixels=keyboard.rgb_num_pixels)
+layers_ext = Layers()
+
+# TODO Comment one of these on each side
+split_side = SplitSide.LEFT
+split_side = SplitSide.RIGHT
+split = Split(split_type=SplitType.BLE, split_side=split_side)
+
+keyboard.modules = [layers_ext, split]
+keyboard.extensions = [rgb_ext]
+
 _______ = KC.TRNS
 XXXXXXX = KC.NO
 
@@ -13,17 +24,6 @@ LOWER = KC.MO(3)
 RAISE = KC.MO(4)
 ADJUST = KC.MO(5)
 
-rgb_ext = RGB(pixel_pin=keyboard.rgb_pixel_pin, num_pixels=keyboard.rgb_num_pixels)
-layers_ext = Layers()
-#
-# TODO Comment one of these on each side
-# Left is 0, Right is 1
-split_side = 0
-split_side = 1
-split = BLE_Split(split_side=split_side)
-
-keyboard.extensions = [rgb_ext, layers_ext, split]
-
 keyboard.keymap = [
     # Qwerty
     # ,-----------------------------------------------------------------------------------.

boards/klarank.py

@@ -1,9 +1,9 @@
 import board
 
-from kmk.extensions.layers import Layers
 from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 from kmk.matrix import intify_coordinate as ic
+from kmk.modules.layers import Layers
 
 # Implements what used to be handled by KMKKeyboard.swap_indicies for this
 # board, by flipping various row3 (bottom physical row) keys so their
@@ -43,4 +43,4 @@ class KMKKeyboard(_KMKKeyboard):
     coord_mapping.extend(ic(3, r3_swap(x)) for x in range(12))
 
     layers_ext = Layers()
-    extensions = [layers_ext]
+    modules = [layers_ext]

boards/reviung39/main.py

@@ -1,25 +1,26 @@
 from kb import KMKKeyboard
-from kmk.extensions.layers import Layers
-from kmk.extensions.modtap import ModTap
 from kmk.extensions.rgb import RGB
 from kmk.keys import KC
+from kmk.modules.layers import Layers
+from kmk.modules.modtap import ModTap
 
 keyboard = KMKKeyboard()
 
-# Cleaner key names
-_______ = KC.TRNS
-XXXXXXX = KC.NO
-
-LOWER = KC.MO(1)
-RAISE = KC.MO(2)
-
 # Adding extentions
 rgb = RGB(pixel_pin=keyboard.rgb_pixel_pin, num_pixels=keyboard.rgb_num_pixels, val_limit=100, hue_default=190, sat_default=100, val_default=5)
 
 modtap = ModTap()
 layers_ext = Layers()
 
-keyboard.extensions = [layers_ext, modtap, rgb]
+keyboard.modules = [layers_ext, modtap]
+keyboard.extensions = [rgb]
+
+# Cleaner key names
+_______ = KC.TRNS
+XXXXXXX = KC.NO
+
+LOWER = KC.MO(1)
+RAISE = KC.MO(2)
 
 keyboard.keymap = [
     [  #QWERTY

boards/reviung41/main.py

@@ -1,11 +1,20 @@
 from kb import KMKKeyboard
-from kmk.extensions.layers import Layers
-from kmk.extensions.modtap import ModTap
 from kmk.extensions.rgb import RGB
 from kmk.keys import KC
+from kmk.modules.layers import Layers
+from kmk.modules.modtap import ModTap
 
 keyboard = KMKKeyboard()
 
+# Adding extentions
+rgb = RGB(pixel_pin=keyboard.rgb_pixel_pin, num_pixels=keyboard.rgb_num_pixels, val_limit=100, hue_default=190, sat_default=100, val_default=5)
+
+modtap = ModTap()
+layers_ext = Layers()
+
+keyboard.modules = [layers_ext, modtap]
+keyboard.extensions = [rgb]
+
 # Cleaner key names
 _______ = KC.TRNS
 XXXXXXX = KC.NO
@@ -24,14 +33,6 @@ RGB_SAD = KC.RGB_SAD
 RGB_VAI = KC.RGB_VAI
 RGB_VAD = KC.RGB_VAD
 
-# Adding extentions
-rgb = RGB(pixel_pin=keyboard.rgb_pixel_pin, num_pixels=keyboard.rgb_num_pixels, val_limit=100, hue_default=190, sat_default=100, val_default=5)
-
-modtap = ModTap()
-layers_ext = Layers()
-
-keyboard.extensions = [layers_ext, modtap, rgb]
-
 keyboard.keymap = [
     [  #QWERTY
         KC.TAB,    KC.Q,    KC.W,    KC.E,    KC.R,    KC.T,                         KC.Y,    KC.U,    KC.I,    KC.O,   KC.P,  KC.BSPC,

boards/rhymestone/main.py

@@ -1,10 +1,19 @@
 from kb import KMKKeyboard
-from kmk.extensions.ble_split import BLE_Split
 from kmk.extensions.layers import Layers
+from kmk.extensions.split import Split, SplitSide, SplitType
 from kmk.keys import KC
 
 keyboard = KMKKeyboard()
 
+# TODO Comment one of these on each side
+split_side = SplitSide.LEFT
+split_side = SplitSide.RIGHT
+split = Split(split_type=SplitType.BLE, split_side=split_side)
+
+layers_ext = Layers()
+
+keyboard.extensions = [layers_ext, split]
+
 # Cleaner key names
 _______ = KC.TRNS
 XXXXXXX = KC.NO
@@ -17,16 +26,6 @@ KC_SLSF = KC.RSFT(KC.SLSH)
 KC_11SF = KC.LSFT(KC.F11)
 KC_GRSF = KC.RSFT(KC.GRV)
 
-# TODO Comment one of these on each side
-# Left is 0, Right is 1
-split_side = 0
-split_side = 1
-split = BLE_Split(split_side=split_side)
-
-layers_ext = Layers()
-
-keyboard.extensions = [layers_ext, split]
-
 keyboard.keymap = [
     [  #QWERTY
         KC.Q,     KC.W,     KC.E,     KC.R,     KC.T,     KC.Y,     KC.U,     KC.I,     KC.O,     KC.P,

boards/tg4x/main.py

@@ -1,7 +1,7 @@
 from kb import KMKKeyboard
-from kmk.extensions.layers import Layers
 from kmk.extensions.rgb import RGB
 from kmk.keys import KC
+from kmk.modules.layers import Layers
 
 keyboard = KMKKeyboard()
 
@@ -14,7 +14,8 @@ rgb = RGB(pixel_pin=keyboard.rgb_pixel_pin, num_pixels=keyboard.rgb_num_pixels,
 
 layers_ext = Layers()
 
-keyboard.extensions = [layers_ext, rgb]
+keyboard.modules = [layers_ext]
+keyboard.extensions = [rgb]
 
 keyboard.keymap = [
     [  #QWERTY