diff --git a/boards/shields/corne/Kconfig.defconfig b/boards/shields/corne/Kconfig.defconfig index 2071a5a..54be731 100644 --- a/boards/shields/corne/Kconfig.defconfig +++ b/boards/shields/corne/Kconfig.defconfig @@ -1,4 +1,3 @@ -## ----------------------------------------------------------------- if SHIELD_CORNE_LEFT || SHIELD_CORNE_DONGLE config ZMK_KEYBOARD_NAME @@ -7,35 +6,11 @@ config ZMK_KEYBOARD_NAME config ZMK_SPLIT_ROLE_CENTRAL default y -config ZMK_SPLIT_BLE_CENTRAL_PERIPHERALS - default 2 - -config BT_MAX_CONN - default 2 - -config BT_MAX_PAIRED - default 2 - -config ZMK_STUDIO +config ZMK_USB default y -config ZMK_STUDIO_LOCKING - default n +endif -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 @@ -50,8 +25,6 @@ config SSD1306 default y endif # ZMK_DISPLAY - -## ------------------ if LVGL @@ -71,5 +44,3 @@ endchoice endif # LVGL endif - - diff --git a/boards/shields/corne/corne.conf b/boards/shields/corne/corne.conf index e69de29..974243c 100644 --- a/boards/shields/corne/corne.conf +++ b/boards/shields/corne/corne.conf @@ -0,0 +1,6 @@ +# Uncomment the following lines to enable the Corne RGB Underglow +# CONFIG_ZMK_RGB_UNDERGLOW=y +# CONFIG_WS2812_STRIP=y + +# Uncomment the following line to enable the Corne OLED Display +# CONFIG_ZMK_DISPLAY=y diff --git a/boards/shields/corne/corne.dtsi b/boards/shields/corne/corne.dtsi index e69de29..f6d41e3 100644 --- a/boards/shields/corne/corne.dtsi +++ b/boards/shields/corne/corne.dtsi @@ -0,0 +1,82 @@ +/* + * 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 index e69de29..1bc054b 100644 --- a/boards/shields/corne/corne.keymap +++ b/boards/shields/corne/corne.keymap @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include +#include +#include + +/ { + keymap { + compatible = "zmk,keymap"; + + default_layer { + bindings = < +&kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC +&kp LCTRL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp ENTER +&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp ESC + &kp LGUI &mo 1 &kp SPACE &kp SPACE &mo 2 &kp RALT + >; + }; + + lower_layer { + bindings = < +&kp LS(TAB) &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC +&kp LCTRL &none &none &none &none &none &kp LEFT_ARROW &kp DOWN_ARROW &kp UP_ARROW &kp RIGHT_ARROW &none &kp ENTER +&kp LSHFT &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR &none &none &none &none &kp ESC + &kp LGUI &mo 1 &kp SPACE &kp SPACE &mo 2 &kp RALT + >; + }; + + raise_layer { + bindings = < +&kp LC(TAB) &kp EXCL &kp AT &kp POUND &kp DOLLAR &kp PERCENT &kp CARET &kp AMPERSAND &kp STAR &kp PLUS &kp EQUAL &kp BSPC +&kp LCTRL &kp GRAVE &kp TILDE &kp LEFT_BRACE &kp LEFT_BRACKET &kp LEFT_PARENTHESIS &kp RIGHT_PARENTHESIS &kp RIGHT_BRACKET &kp RIGHT_BRACE &kp BACKSLASH &kp PIPE &kp ENTER +&kp LSHFT &none &none &none &kp SQT &kp MINUS &kp UNDER &kp DOUBLE_QUOTES &none &none &none &kp RIGHT_SHIFT + &kp LGUI &mo 1 &kp SPACE &kp SPACE &mo 2 &kp RALT + >; + }; + }; +}; diff --git a/boards/shields/corne/corne.zmk.yml b/boards/shields/corne/corne.zmk.yml index b7c05f2..5e78dbc 100644 --- a/boards/shields/corne/corne.zmk.yml +++ b/boards/shields/corne/corne.zmk.yml @@ -8,6 +8,7 @@ exposes: [i2c_oled] features: - keys - display + - underglow siblings: - corne_left - corne_right diff --git a/boards/shields/corne/corne_dongle_xiao.conf b/boards/shields/corne/corne_dongle.conf similarity index 57% rename from boards/shields/corne/corne_dongle_xiao.conf rename to boards/shields/corne/corne_dongle.conf index 7537dd2..c2718cf 100644 --- a/boards/shields/corne/corne_dongle_xiao.conf +++ b/boards/shields/corne/corne_dongle.conf @@ -4,8 +4,3 @@ 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_xiao.overlay b/boards/shields/corne/corne_dongle.overlay similarity index 100% rename from boards/shields/corne/corne_dongle_xiao.overlay rename to boards/shields/corne/corne_dongle.overlay diff --git a/boards/shields/corne/corne_left.conf b/boards/shields/corne/corne_left.conf index e69de29..b3c8e61 100644 --- a/boards/shields/corne/corne_left.conf +++ b/boards/shields/corne/corne_left.conf @@ -0,0 +1,30 @@ +# Board Name +CONFIG_ZMK_KEYBOARD_NAME="Corne-Bop" + +# Enable and adjust nice!view +CONFIG_ZMK_DISPLAY=y +CONFIG_ZMK_WIDGET_BATTERY_STATUS_SHOW_PERCENTAGE=y +CONFIG_ZMK_WIDGET_WPM_STATUS=n + +# Disable in-built nice!view widget +CONFIG_ZMK_DISPLAY_STATUS_SCREEN_BUILT_IN=y +CONFIG_ZMK_LV_FONT_DEFAULT_SMALL_MONTSERRAT_26=y +CONFIG_LV_FONT_DEFAULT_MONTSERRAT_26=y + +# Increase the bluetooth transmission power +CONFIG_BT_CTLR_TX_PWR_PLUS_8=y +CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y +CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y + +# Set sleep timeout to 30 minutes +CONFIG_ZMK_SLEEP=y +CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000 + +# Enable eager debouncing +CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=1 +CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=10 + +# Enable ZMK Studio for Realtime Keymap Updates +# CONFIG_ZMK_STUDIO=y +# CONFIG_ZMK_STUDIO_LOCKING=n + diff --git a/boards/shields/corne/corne_peripheral_left.conf b/boards/shields/corne/corne_peripheral_left.conf index e69de29..e4d224a 100644 --- a/boards/shields/corne/corne_peripheral_left.conf +++ b/boards/shields/corne/corne_peripheral_left.conf @@ -0,0 +1,27 @@ +# Enable and adjust nice!view +CONFIG_ZMK_DISPLAY=y +CONFIG_ZMK_WIDGET_BATTERY_STATUS_SHOW_PERCENTAGE=y +CONFIG_ZMK_WIDGET_WPM_STATUS=n + +# Disable in-built nice!view widget +CONFIG_ZMK_DISPLAY_STATUS_SCREEN_BUILT_IN=y +CONFIG_ZMK_LV_FONT_DEFAULT_SMALL_MONTSERRAT_26=y +CONFIG_LV_FONT_DEFAULT_MONTSERRAT_26=y + +# Increase the bluetooth transmission power +CONFIG_BT_CTLR_TX_PWR_PLUS_8=y +CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y +CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y + +# Set sleep timeout to 30 minutes +CONFIG_ZMK_SLEEP=y +CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000 + +# Enable eager debouncing +CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=1 +CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=10 + +# Enable ZMK Studio for Realtime Keymap Updates +# CONFIG_ZMK_STUDIO=y +# CONFIG_ZMK_STUDIO_LOCKING=n + diff --git a/boards/shields/corne/corne_right.conf b/boards/shields/corne/corne_right.conf index e69de29..e4d224a 100644 --- a/boards/shields/corne/corne_right.conf +++ b/boards/shields/corne/corne_right.conf @@ -0,0 +1,27 @@ +# Enable and adjust nice!view +CONFIG_ZMK_DISPLAY=y +CONFIG_ZMK_WIDGET_BATTERY_STATUS_SHOW_PERCENTAGE=y +CONFIG_ZMK_WIDGET_WPM_STATUS=n + +# Disable in-built nice!view widget +CONFIG_ZMK_DISPLAY_STATUS_SCREEN_BUILT_IN=y +CONFIG_ZMK_LV_FONT_DEFAULT_SMALL_MONTSERRAT_26=y +CONFIG_LV_FONT_DEFAULT_MONTSERRAT_26=y + +# Increase the bluetooth transmission power +CONFIG_BT_CTLR_TX_PWR_PLUS_8=y +CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y +CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y + +# Set sleep timeout to 30 minutes +CONFIG_ZMK_SLEEP=y +CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000 + +# Enable eager debouncing +CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=1 +CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=10 + +# Enable ZMK Studio for Realtime Keymap Updates +# CONFIG_ZMK_STUDIO=y +# CONFIG_ZMK_STUDIO_LOCKING=n + diff --git a/build.yaml b/build.yaml index bd5c36a..f367750 100644 --- a/build.yaml +++ b/build.yaml @@ -19,20 +19,18 @@ # --- include: - # nice_nano_v2 + nice_view - board: nice_nano_v2 shield: corne_left nice_view_adapter nice_view - board: nice_nano_v2 shield: corne_right nice_view_adapter nice_view + - board: nice_nano_v2 + shield: settings_reset - # xiao_dongle + # Add custom dongle and a peripheral left corne - board: seeeduino_xiao_ble shield: corne_dongle - snippet: studio-rpc-usb-uart - 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 diff --git a/config/corne.conf b/config/corne.conf deleted file mode 100644 index f12a933..0000000 --- a/config/corne.conf +++ /dev/null @@ -1,29 +0,0 @@ -# Board Name -CONFIG_ZMK_KEYBOARD_NAME="Corne Bop" - -# Enable and adjust nice!view -CONFIG_ZMK_DISPLAY=y -CONFIG_ZMK_WIDGET_BATTERY_STATUS_SHOW_PERCENTAGE=y -CONFIG_ZMK_WIDGET_WPM_STATUS=n - -# Disable in-built nice!view widget -CONFIG_ZMK_DISPLAY_STATUS_SCREEN_BUILT_IN=y -CONFIG_ZMK_LV_FONT_DEFAULT_SMALL_MONTSERRAT_26=y -CONFIG_LV_FONT_DEFAULT_MONTSERRAT_26=y - -# Increase the bluetooth transmission power -CONFIG_BT_CTLR_TX_PWR_PLUS_8=y -CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y - -# Set sleep timeout to 30 minutes -CONFIG_ZMK_SLEEP=y -CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000 - -# Enable eager debouncing -CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=1 -CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=10 - -# Enable ZMK Studio for Realtime Keymap Updates -CONFIG_ZMK_STUDIO=y -CONFIG_ZMK_STUDIO_LOCKING=n -