From 0c170878af6cd63ce2c8ebfdf7434515396975d3 Mon Sep 17 00:00:00 2001 From: Darren Victoriano Date: Thu, 30 Jan 2025 23:26:00 -0800 Subject: [PATCH] added xiao dongle support --- boards/shields/corne/Kconfig.defconfig | 33 +++++++- boards/shields/corne/corne.conf | 0 boards/shields/corne/corne.dtsi | 82 ------------------- boards/shields/corne/corne.keymap | 0 boards/shields/corne/corne_dongle.conf | 6 -- boards/shields/corne/corne_dongle_xiao.conf | 11 +++ ...ngle.overlay => corne_dongle_xiao.overlay} | 0 build.yaml | 1 + 8 files changed, 43 insertions(+), 90 deletions(-) create mode 100644 boards/shields/corne/corne.conf create mode 100644 boards/shields/corne/corne.keymap delete mode 100644 boards/shields/corne/corne_dongle.conf create mode 100644 boards/shields/corne/corne_dongle_xiao.conf rename boards/shields/corne/{corne_dongle.overlay => corne_dongle_xiao.overlay} (100%) diff --git a/boards/shields/corne/Kconfig.defconfig b/boards/shields/corne/Kconfig.defconfig index 54be731..2071a5a 100644 --- a/boards/shields/corne/Kconfig.defconfig +++ b/boards/shields/corne/Kconfig.defconfig @@ -1,3 +1,4 @@ +## ----------------------------------------------------------------- if SHIELD_CORNE_LEFT || SHIELD_CORNE_DONGLE config ZMK_KEYBOARD_NAME @@ -6,11 +7,35 @@ config ZMK_KEYBOARD_NAME config ZMK_SPLIT_ROLE_CENTRAL default y -config ZMK_USB +config ZMK_SPLIT_BLE_CENTRAL_PERIPHERALS + default 2 + +config BT_MAX_CONN + default 2 + +config BT_MAX_PAIRED + default 2 + +config ZMK_STUDIO default y -endif +config ZMK_STUDIO_LOCKING + default n +config ZMK_SLEEP + default n + +endif ## SHIELD_CORNE_DONGLE + +## ----------------------------------------------------------------- +if SHIELD_CORNE_LEFT || SHIELD_CORNE_RIGHT + +config ZMK_SPLIT_ROLE_CENTRAL + default n + +endif ## SHIELD_CORNE_LEFT || SHIELD_CORNE_RIGHT + +## ----------------------------------------------------------------- if SHIELD_CORNE_LEFT || SHIELD_CORNE_RIGHT || SHIELD_CORNE_DONGLE || SHIELD_CORNE_PERIPHERAL_LEFT config ZMK_SPLIT @@ -25,6 +50,8 @@ config SSD1306 default y endif # ZMK_DISPLAY + +## ------------------ if LVGL @@ -44,3 +71,5 @@ endchoice endif # LVGL endif + + diff --git a/boards/shields/corne/corne.conf b/boards/shields/corne/corne.conf new file mode 100644 index 0000000..e69de29 diff --git a/boards/shields/corne/corne.dtsi b/boards/shields/corne/corne.dtsi index f6d41e3..e69de29 100644 --- a/boards/shields/corne/corne.dtsi +++ b/boards/shields/corne/corne.dtsi @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2020 Pete Johanson - * - * SPDX-License-Identifier: MIT - */ - -#include - -/ { - chosen { - zephyr,display = &oled; - zmk,kscan = &kscan0; - zmk,matrix-transform = &default_transform; - }; - - default_transform: keymap_transform_0 { - compatible = "zmk,matrix-transform"; - columns = <12>; - rows = <4>; -// | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | -// | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | -// | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | -// | SW19 | SW20 | SW21 | | SW21 | SW20 | SW19 | - map = < -RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) -RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) -RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) - RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) - >; - }; - - five_column_transform: keymap_transform_1 { - compatible = "zmk,matrix-transform"; - columns = <10>; - rows = <4>; -// | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | -// | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | -// | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | -// | SW19 | SW20 | SW21 | | SW21 | SW20 | SW19 | - map = < -RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) -RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) -RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) - RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) - >; - }; - - kscan0: kscan { - compatible = "zmk,kscan-gpio-matrix"; - - diode-direction = "col2row"; - row-gpios - = <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - ; - - }; - - // TODO: per-key RGB node(s)? -}; - -&pro_micro_i2c { - status = "okay"; - - oled: ssd1306@3c { - compatible = "solomon,ssd1306fb"; - reg = <0x3c>; - width = <128>; - height = <32>; - segment-offset = <0>; - page-offset = <0>; - display-offset = <0>; - multiplex-ratio = <31>; - segment-remap; - com-invdir; - com-sequential; - inversion-on; - prechargep = <0x22>; - }; -}; diff --git a/boards/shields/corne/corne.keymap b/boards/shields/corne/corne.keymap new file mode 100644 index 0000000..e69de29 diff --git a/boards/shields/corne/corne_dongle.conf b/boards/shields/corne/corne_dongle.conf deleted file mode 100644 index 330217a..0000000 --- a/boards/shields/corne/corne_dongle.conf +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_BT_CTLR_TX_PWR_PLUS_8=y -CONFIG_ZMK_SLEEP=n - -# Allow multiple peripherals -CONFIG_ZMK_SPLIT_BLE_CENTRAL_PERIPHERALS=2 - diff --git a/boards/shields/corne/corne_dongle_xiao.conf b/boards/shields/corne/corne_dongle_xiao.conf new file mode 100644 index 0000000..7537dd2 --- /dev/null +++ b/boards/shields/corne/corne_dongle_xiao.conf @@ -0,0 +1,11 @@ +CONFIG_BT_CTLR_TX_PWR_PLUS_8=y +CONFIG_ZMK_SLEEP=n + +### DONGLE MODE +CONFIG_ZMK_SPLIT_BLE_CENTRAL_PERIPHERALS=2 + +### DONGLE OPTIONS +# 3 profiles (n+2) +CONFIG_BT_MAX_CONN=5 +CONFIG_BT_MAX_PAIRED=5 + diff --git a/boards/shields/corne/corne_dongle.overlay b/boards/shields/corne/corne_dongle_xiao.overlay similarity index 100% rename from boards/shields/corne/corne_dongle.overlay rename to boards/shields/corne/corne_dongle_xiao.overlay diff --git a/build.yaml b/build.yaml index 027f9f6..bd5c36a 100644 --- a/build.yaml +++ b/build.yaml @@ -32,6 +32,7 @@ include: artifact-name: xiao_dongle - board: nice_nano_v2 shield: corne_peripheral_left nice_view_adapter nice_view + snippet: studio-rpc-usb-uart # reset_settings - board: nice_nano_v2