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.
2020-12-12 23:13:49 -05:00
parent 842aa5a842
commit 4db5b169bf
36 changed files with 92 additions and 79 deletions
--- a/app/boards/shields/corne/Kconfig.defconfig
+++ b/app/boards/shields/corne/Kconfig.defconfig
@@ -1,12 +1,13 @@
-
 if SHIELD_CORNE_LEFT

 config ZMK_KEYBOARD_NAME
-	default "Corne Left"
+	default "Corne"
+
+config ZMK_SPLIT_BLE_ROLE_CENTRAL
+	default y

 endif

-
 if SHIELD_CORNE_RIGHT

 config ZMK_KEYBOARD_NAME
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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


--- 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
--- 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
--- 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


--- 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
--- 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
--- 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
+
--- 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
--- 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
+
--- 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


--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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