refactor(splits): Ability to override split role.

* Move central/peripheral setting to Kconfig.defconfig files to allow left/right .conf files to override central/peripheral role for splits.
cwebster2 · Dec 28, 2020 · 4db5b16 · 4db5b16
1 parent 842aa5a
commit 4db5b16
Show file tree

Hide file tree

Showing 36 changed files with 92 additions and 79 deletions.
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -39,7 +39,7 @@ target_sources(app PRIVATE src/events/sensor_event.c)
 target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/events/ble_active_profile_changed.c)
 target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/events/battery_state_changed.c)
 target_sources_ifdef(CONFIG_USB app PRIVATE src/events/usb_conn_state_changed.c)
-if (NOT CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL)
+if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL)
   target_sources(app PRIVATE src/behaviors/behavior_key_press.c)
   target_sources(app PRIVATE src/behaviors/behavior_reset.c)
   target_sources(app PRIVATE src/behaviors/behavior_hold_tap.c)
@@ -57,9 +57,13 @@ target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/behaviors/behavior
 target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/behaviors/behavior_bt.c)
 target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/ble.c)
 target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/battery.c)
-target_sources_ifdef(CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL app PRIVATE src/split_listener.c)
-target_sources_ifdef(CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL app PRIVATE src/split/bluetooth/service.c)
-target_sources_ifdef(CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL app PRIVATE src/split/bluetooth/central.c)
+if (CONFIG_ZMK_SPLIT_BLE AND (NOT CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL))
+	target_sources(app PRIVATE src/split_listener.c)
+	target_sources(app PRIVATE src/split/bluetooth/service.c)
+endif()
+if (CONFIG_ZMK_SPLIT_BLE AND CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL)
+	target_sources(app PRIVATE src/split/bluetooth/central.c)
+endif()
 target_sources_ifdef(CONFIG_USB app PRIVATE src/usb.c)
 target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/hog.c)
 target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/rgb_underglow.c)

diff --git a/app/Kconfig b/app/Kconfig
@@ -83,7 +83,6 @@ menu "Split Support"
 
 config ZMK_SPLIT
 	bool "Split keyboard support"
-	default n
 
 if ZMK_SPLIT
 
@@ -95,19 +94,12 @@ config ZMK_SPLIT_BLE
 
 if ZMK_SPLIT_BLE
 
-choice ZMK_SPLIT_BLE_ROLE
-	bool "BLE Role For Split Communication"
-	default ZMK_SPLIT_BLE_ROLE_CENTRAL
-
 config ZMK_SPLIT_BLE_ROLE_CENTRAL
 	bool "Central"
 	select BT_CENTRAL
 	select BT_GATT_CLIENT
 
-config ZMK_SPLIT_BLE_ROLE_PERIPHERAL
-	bool "Peripheral"
-
-if ZMK_SPLIT_BLE_ROLE_PERIPHERAL
+if !ZMK_SPLIT_BLE_ROLE_CENTRAL
 
 config ZMK_USB
 	default n
@@ -121,12 +113,9 @@ config BT_MAX_CONN
 config BT_GAP_AUTO_UPDATE_CONN_PARAMS
 	default n
 
-#ZMK_SPLIT_BLE_ROLE_PERIPHERAL
+#!ZMK_SPLIT_BLE_ROLE_CENTRAL
 endif
 
-#ZMK_SPLIT_BLE_ROLE
-endchoice
-
 #ZMK_SPLIT_BLE
 endif
 

diff --git a/app/boards/shields/corne/Kconfig.defconfig b/app/boards/shields/corne/Kconfig.defconfig
@@ -1,11 +1,12 @@
-
 if SHIELD_CORNE_LEFT
 
 config ZMK_KEYBOARD_NAME
-	default "Corne Left"
+	default "Corne"
 
-endif
+config ZMK_SPLIT_BLE_ROLE_CENTRAL
+	default y
 
+endif
 
 if SHIELD_CORNE_RIGHT
 

diff --git a/app/boards/shields/corne/corne_left.conf b/app/boards/shields/corne/corne_left.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y

diff --git a/app/boards/shields/corne/corne_right.conf b/app/boards/shields/corne/corne_right.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y

diff --git a/app/boards/shields/cradio/Kconfig.defconfig b/app/boards/shields/cradio/Kconfig.defconfig
@@ -6,6 +6,9 @@ if SHIELD_CRADIO_LEFT
 config ZMK_KEYBOARD_NAME
 	default "cradio left"
 
+config ZMK_SPLIT_BLE_ROLE_CENTRAL
+	default y
+
 endif
 
 if SHIELD_CRADIO_RIGHT
@@ -14,3 +17,10 @@ config ZMK_KEYBOARD_NAME
 	default "cradio right"
 
 endif
+
+if SHIELD_CRADIO_LEFT || SHIELD_CRADIO_RIGHT
+
+config ZMK_SPLIT
+	default y
+
+endif
diff --git a/app/boards/shields/cradio/cradio_left.conf b/app/boards/shields/cradio/cradio_left.conf
@@ -1,5 +1,2 @@
 # Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
-
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y
diff --git a/app/boards/shields/cradio/cradio_right.conf b/app/boards/shields/cradio/cradio_right.conf
@@ -1,5 +1,3 @@
 # Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y
diff --git a/app/boards/shields/iris/Kconfig.defconfig b/app/boards/shields/iris/Kconfig.defconfig
@@ -6,6 +6,9 @@ if SHIELD_IRIS_LEFT
 config ZMK_KEYBOARD_NAME
 	default "Iris Left"
 
+config ZMK_SPLIT_BLE_ROLE_CENTRAL
+	default y
+
 endif
 
 if SHIELD_IRIS_RIGHT
@@ -14,3 +17,10 @@ config ZMK_KEYBOARD_NAME
 	default "Iris Right"
 
 endif
+
+if SHIELD_IRIS_LEFT || SHIELD_IRIS_RIGHT
+
+config ZMK_SPLIT
+	default y
+
+endif
diff --git a/app/boards/shields/iris/iris_left.conf b/app/boards/shields/iris/iris_left.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y

diff --git a/app/boards/shields/iris/iris_right.conf b/app/boards/shields/iris/iris_right.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y

diff --git a/app/boards/shields/jian/Kconfig.defconfig b/app/boards/shields/jian/Kconfig.defconfig
@@ -4,6 +4,9 @@ if SHIELD_JIAN_LEFT
 config ZMK_KEYBOARD_NAME
 	default "Jian Left"
 
+config ZMK_SPLIT_BLE_ROLE_CENTRAL
+	default y
+
 endif
 
 
@@ -18,6 +21,5 @@ if SHIELD_JIAN_LEFT || SHIELD_JIAN_RIGHT
 
 config ZMK_SPLIT
 	default y
-
 
 endif
diff --git a/app/boards/shields/jian/jian_left.conf b/app/boards/shields/jian/jian_left.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y

diff --git a/app/boards/shields/jian/jian_right.conf b/app/boards/shields/jian/jian_right.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y

diff --git a/app/boards/shields/jorne/Kconfig.defconfig b/app/boards/shields/jorne/Kconfig.defconfig
@@ -4,6 +4,9 @@ if SHIELD_JORNE_LEFT
 config ZMK_KEYBOARD_NAME
 	default "Jorne Left"
 
+config ZMK_SPLIT_BLE_ROLE_CENTRAL
+	default y
+
 endif
 
 

diff --git a/app/boards/shields/jorne/jorne_left.conf b/app/boards/shields/jorne/jorne_left.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y

diff --git a/app/boards/shields/jorne/jorne_right.conf b/app/boards/shields/jorne/jorne_right.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y

diff --git a/app/boards/shields/kyria/Kconfig.defconfig b/app/boards/shields/kyria/Kconfig.defconfig
@@ -4,6 +4,9 @@ if SHIELD_KYRIA_LEFT
 config ZMK_KEYBOARD_NAME
 	default "Kyria Left"
 
+config ZMK_SPLIT_BLE_ROLE_CENTRAL
+	default y
+
 endif
 
 

diff --git a/app/boards/shields/kyria/kyria_left.conf b/app/boards/shields/kyria/kyria_left.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y

diff --git a/app/boards/shields/kyria/kyria_right.conf b/app/boards/shields/kyria/kyria_right.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y

diff --git a/app/boards/shields/lily58/Kconfig.defconfig b/app/boards/shields/lily58/Kconfig.defconfig
@@ -4,6 +4,9 @@ if SHIELD_LILY58_LEFT
 config ZMK_KEYBOARD_NAME
 	default "Lily58 Left"
 
+config ZMK_SPLIT_BLE_ROLE_CENTRAL
+	default y
+
 endif
 
 if SHIELD_LILY58_RIGHT
@@ -15,6 +18,9 @@ endif
 
 if SHIELD_LILY58_LEFT || SHIELD_LILY58_RIGHT
 
+config ZMK_SPLIT
+	default y
+
 if ZMK_DISPLAY
 
 config I2C
@@ -52,3 +58,4 @@ endchoice
 endif # LVGL
 
 endif
+
diff --git a/app/boards/shields/lily58/lily58_left.conf b/app/boards/shields/lily58/lily58_left.conf
@@ -1,6 +1,3 @@
 # Uncomment to enable encoder
 # CONFIG_EC11=y
 # CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
-
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y
diff --git a/app/boards/shields/lily58/lily58_right.conf b/app/boards/shields/lily58/lily58_right.conf
@@ -1,2 +1 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y
+
diff --git a/app/boards/shields/microdox/Kconfig.defconfig b/app/boards/shields/microdox/Kconfig.defconfig
@@ -6,6 +6,9 @@ if SHIELD_MICRODOX_LEFT
 config ZMK_KEYBOARD_NAME
 	default "Microdox Left"
 
+config ZMK_SPLIT_BLE_ROLE_CENTRAL
+	default y
+
 endif
 
 

diff --git a/app/boards/shields/microdox/microdox_left.conf b/app/boards/shields/microdox/microdox_left.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y

diff --git a/app/boards/shields/microdox/microdox_right.conf b/app/boards/shields/microdox/microdox_right.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y

diff --git a/app/boards/shields/quefrency/Kconfig.defconfig b/app/boards/shields/quefrency/Kconfig.defconfig
@@ -7,6 +7,9 @@ if SHIELD_QUEFRENCY_LEFT
 config ZMK_KEYBOARD_NAME
 	default "Quefrency Left"
 
+config ZMK_SPLIT_BLE_ROLE_CENTRAL
+	default y
+
 endif
 
 if SHIELD_QUEFRENCY_RIGHT
@@ -15,3 +18,10 @@ config ZMK_KEYBOARD_NAME
 	default "Quefrency Right"
 
 endif
+
+if SHIELD_QUEFRENCY_LEFT || SHIELD_QUEFRENCY_RIGHT
+
+config ZMK_SPLIT
+	default y
+
+endif
diff --git a/app/boards/shields/quefrency/quefrency_left.conf b/app/boards/shields/quefrency/quefrency_left.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y

diff --git a/app/boards/shields/quefrency/quefrency_right.conf b/app/boards/shields/quefrency/quefrency_right.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y

diff --git a/app/boards/shields/sofle/Kconfig.defconfig b/app/boards/shields/sofle/Kconfig.defconfig
@@ -5,6 +5,10 @@ if SHIELD_SOFLE_LEFT
 
 config ZMK_KEYBOARD_NAME
 	default "Sofle Left"
+
+config ZMK_SPLIT_BLE_ROLE_CENTRAL
+	default y
+
 endif
 
 if SHIELD_SOFLE_RIGHT
@@ -15,6 +19,9 @@ endif
 
 if SHIELD_SOFLE_LEFT || SHIELD_SOFLE_RIGHT
 
+config ZMK_SPLIT
+	default y
+
 if ZMK_DISPLAY
 
 config I2C

diff --git a/app/boards/shields/sofle/sofle_left.conf b/app/boards/shields/sofle/sofle_left.conf
@@ -1,5 +1,2 @@
 # Copyright (c) 2020 Ryan Cross
 # SPDX-License-Identifier: MIT
-
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y
diff --git a/app/boards/shields/sofle/sofle_right.conf b/app/boards/shields/sofle/sofle_right.conf
@@ -1,5 +1,2 @@
 # Copyright (c) 2020 Ryan Cross
 # SPDX-License-Identifier: MIT
-
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y
diff --git a/app/boards/shields/splitreus62/Kconfig.defconfig b/app/boards/shields/splitreus62/Kconfig.defconfig
@@ -8,6 +8,9 @@ if SHIELD_SPLITREUS62_LEFT
 config ZMK_KEYBOARD_NAME
 	default "Splitreus62 Left"
 
+config ZMK_SPLIT_BLE_ROLE_CENTRAL
+	default y
+
 endif
 
 if SHIELD_SPLITREUS62_RIGHT
@@ -19,4 +22,7 @@ endif
 
 if SHIELD_SPLITREUS62_LEFT || SHIELD_SPLITREUS62_RIGHT
 
+config ZMK_SPLIT
+	default y
+
 endif
diff --git a/app/boards/shields/splitreus62/splitreus62_left.conf b/app/boards/shields/splitreus62/splitreus62_left.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y

diff --git a/app/boards/shields/splitreus62/splitreus62_right.conf b/app/boards/shields/splitreus62/splitreus62_right.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y
Original file line number	Diff line number	Diff line change
		@@ -1,2 +0,0 @@
		CONFIG_ZMK_SPLIT=y
		CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y
Original file line number	Diff line number	Diff line change
		@@ -1,2 +0,0 @@
		CONFIG_ZMK_SPLIT=y
		CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		CONFIG_ZMK_SPLIT=y
		CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y