add dongle

ergonautkb · Dec 21, 2023 · b0b56a6 · b0b56a6
1 parent bc84967
commit b0b56a6
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 13 deletions.
diff --git a/build.yaml b/build.yaml
@@ -3,5 +3,7 @@ include:
     shield: ergonaut_one_left
   - board: seeeduino_xiao_ble
     shield: ergonaut_one_right
+  - board: seeeduino_xiao_ble
+    shield: ergonaut_one_dongle
   - board: seeeduino_xiao_ble
     shield: settings_reset
diff --git a/config/boards/shields/ergonaut_one/Kconfig.defconfig b/config/boards/shields/ergonaut_one/Kconfig.defconfig
@@ -1,17 +1,20 @@
 # Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-if SHIELD_ERGONAUT_ONE_LEFT
+if SHIELD_ERGONAUT_ONE_DONGLE
 
 config ZMK_KEYBOARD_NAME
 	default "Ergonaut One"
 
 config ZMK_SPLIT_ROLE_CENTRAL
 	default y
 
+config USB_HID_POLL_INTERVAL_MS
+	default 1
+
 endif
 
-if SHIELD_ERGONAUT_ONE_LEFT || SHIELD_ERGONAUT_ONE_RIGHT
+if SHIELD_ERGONAUT_ONE_LEFT || SHIELD_ERGONAUT_ONE_RIGHT || SHIELD_ERGONAUT_ONE_DONGLE
 
 config ZMK_SPLIT
 	default y

diff --git a/config/boards/shields/ergonaut_one/Kconfig.shield b/config/boards/shields/ergonaut_one/Kconfig.shield
@@ -6,3 +6,6 @@ config SHIELD_ERGONAUT_ONE_LEFT
 
 config SHIELD_ERGONAUT_ONE_RIGHT
     def_bool $(shields_list_contains,ergonaut_one_right)
+
+config SHIELD_ERGONAUT_ONE_DONGLE
+    def_bool $(shields_list_contains,ergonaut_one_dongle)
diff --git a/config/boards/shields/ergonaut_one/ergonaut_one.keymap b/config/boards/shields/ergonaut_one/ergonaut_one.keymap
@@ -56,7 +56,7 @@
         adjust_layer {
             bindings = <
                 &bootloader   &none          &none          &none          &none          &none          &none          &none          &none          &none          &none          &bootloader
-                &bt BT_CLR    &bt BT_SEL 0   &bt BT_SEL 1   &bt BT_SEL 2   &bt BT_SEL 3   &bt BT_SEL 4   &bt BT_SEL 4   &bt BT_SEL 3   &bt BT_SEL 2   &bt BT_SEL 1   &bt BT_SEL 0   &bt BT_CLR
+                &bt BT_CLR    &none          &none          &none          &none          &none          &none          &none          &none          &none          &none          &bt BT_CLR
                 &sys_reset    &none          &none          &none          &none          &none          &none          &none          &none          &none          &none          &sys_reset
                                                             &trans         &none          &trans         &none          &trans         &trans
             >;

diff --git a/config/boards/shields/ergonaut_one/ergonaut_one.zmk.yml b/config/boards/shields/ergonaut_one/ergonaut_one.zmk.yml
@@ -9,3 +9,4 @@ features:
 siblings:
   - ergonaut_one_left
   - ergonaut_one_right
+  - ergonaut_one_dongle
diff --git a/config/boards/shields/ergonaut_one/ergonaut_one_dongle.conf b/config/boards/shields/ergonaut_one/ergonaut_one_dongle.conf
@@ -0,0 +1,6 @@
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+CONFIG_ZMK_SPLIT_BLE_CENTRAL_PERIPHERALS=2
+CONFIG_BT_MAX_CONN=7
+CONFIG_BT_MAX_PAIRED=7
diff --git a/config/boards/shields/ergonaut_one/ergonaut_one_dongle.overlay b/config/boards/shields/ergonaut_one/ergonaut_one_dongle.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "ergonaut_one.dtsi"
+
+&kscan0 {
+    col-gpios
+        = <&xiao_d 0 GPIO_ACTIVE_HIGH>
+        , <&xiao_d 1 GPIO_ACTIVE_HIGH>
+        , <&xiao_d 2 GPIO_ACTIVE_HIGH>
+        , <&xiao_d 3 GPIO_ACTIVE_HIGH>
+        , <&xiao_d 4 GPIO_ACTIVE_HIGH>
+        , <&xiao_d 5 GPIO_ACTIVE_HIGH>
+        ;
+};
diff --git a/config/boards/shields/ergonaut_one/ergonaut_one_left.conf b/config/boards/shields/ergonaut_one/ergonaut_one_left.conf
diff --git a/config/boards/shields/ergonaut_one/ergonaut_one_right.conf b/config/boards/shields/ergonaut_one/ergonaut_one_right.conf
diff --git a/config/ergonaut_one.conf b/config/ergonaut_one.conf
@@ -1,15 +1,9 @@
 # Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-CONFIG_BT_MAX_CONN=5
-CONFIG_BT_MAX_PAIRED=5
-
 CONFIG_ZMK_IDLE_TIMEOUT=30000
 CONFIG_ZMK_SLEEP=y
 CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=900000
 CONFIG_ZMK_BATTERY_REPORT_INTERVAL=1800
 
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
-
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y