From d85a0f8b6a82f012753a9ce7fa8046622bdd45ab Mon Sep 17 00:00:00 2001 From: Dmitry Kupriyanov Date: Thu, 12 Jan 2023 12:54:57 +0400 Subject: [PATCH 01/15] feat(boards): Add support of Dao keyboard --- app/boards/arm/dao/Kconfig | 8 ++ app/boards/arm/dao/Kconfig.board | 12 +++ app/boards/arm/dao/Kconfig.defconfig | 52 ++++++++++ app/boards/arm/dao/board.cmake | 8 ++ app/boards/arm/dao/dao.dtsi | 136 +++++++++++++++++++++++++ app/boards/arm/dao/dao.keymap | 85 ++++++++++++++++ app/boards/arm/dao/dao.yaml | 18 ++++ app/boards/arm/dao/dao.zmk.yml | 15 +++ app/boards/arm/dao/dao_left.dts | 18 ++++ app/boards/arm/dao/dao_left_defconfig | 41 ++++++++ app/boards/arm/dao/dao_right.dts | 22 ++++ app/boards/arm/dao/dao_right_defconfig | 39 +++++++ 12 files changed, 454 insertions(+) create mode 100644 app/boards/arm/dao/Kconfig create mode 100644 app/boards/arm/dao/Kconfig.board create mode 100644 app/boards/arm/dao/Kconfig.defconfig create mode 100644 app/boards/arm/dao/board.cmake create mode 100644 app/boards/arm/dao/dao.dtsi create mode 100644 app/boards/arm/dao/dao.keymap create mode 100644 app/boards/arm/dao/dao.yaml create mode 100644 app/boards/arm/dao/dao.zmk.yml create mode 100644 app/boards/arm/dao/dao_left.dts create mode 100644 app/boards/arm/dao/dao_left_defconfig create mode 100644 app/boards/arm/dao/dao_right.dts create mode 100644 app/boards/arm/dao/dao_right_defconfig diff --git a/app/boards/arm/dao/Kconfig b/app/boards/arm/dao/Kconfig new file mode 100644 index 00000000..4bc7e0de --- /dev/null +++ b/app/boards/arm/dao/Kconfig @@ -0,0 +1,8 @@ +# Copyright (c) 2021 Rafael Yumagulov +# SPDX-License-Identifier: MIT + +config BOARD_ENABLE_DCDC + bool "Enable DCDC mode" + select SOC_DCDC_NRF52X + default y + depends on (BOARD_DAO_LEFT || BOARD_DAO_RIGHT) diff --git a/app/boards/arm/dao/Kconfig.board b/app/boards/arm/dao/Kconfig.board new file mode 100644 index 00000000..accc3e29 --- /dev/null +++ b/app/boards/arm/dao/Kconfig.board @@ -0,0 +1,12 @@ +# Dao board configuration + +# Copyright (c) 2021 Rafael Yumagulov +# SPDX-License-Identifier: MIT + +config BOARD_DAO_LEFT + bool "dao_left" + depends on SOC_NRF52840_QIAA + +config BOARD_DAO_RIGHT + bool "dao_right" + depends on SOC_NRF52840_QIAA diff --git a/app/boards/arm/dao/Kconfig.defconfig b/app/boards/arm/dao/Kconfig.defconfig new file mode 100644 index 00000000..5a2407f0 --- /dev/null +++ b/app/boards/arm/dao/Kconfig.defconfig @@ -0,0 +1,52 @@ +# Copyright (c) 2021 Rafael Yumagulov +# SPDX-License-Identifier: MIT + +if BOARD_DAO_LEFT + + config ZMK_KEYBOARD_NAME + default "Dao" + + config ZMK_SPLIT_BLE_ROLE_CENTRAL + default y + +endif # BOARD_DAO_LEFT + +if BOARD_DAO_RIGHT + + config ZMK_KEYBOARD_NAME + default "Dao Right" + +endif # BOARD_DAO_RIGHT + + +if BOARD_DAO_LEFT || BOARD_DAO_RIGHT + +config BOARD + default "dao" + +config ZMK_SPLIT + default y + +config BT_CTLR + default BT + +config ZMK_BLE + default y + +config ZMK_USB + default y + +config ZMK_BATTERY_VOLTAGE_DIVIDER + default y + +if USB + +config USB_NRFX + default y + +config USB_DEVICE_STACK + default y + +endif # USB + +endif # BOARD_DAO_LEFT || BOARD_DAO_RIGHT diff --git a/app/boards/arm/dao/board.cmake b/app/boards/arm/dao/board.cmake new file mode 100644 index 00000000..677997f2 --- /dev/null +++ b/app/boards/arm/dao/board.cmake @@ -0,0 +1,8 @@ +# +# Copyright (c) 2020 The ZMK Contributors +# SPDX-License-Identifier: MIT +# + +board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset") +include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) +include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake) diff --git a/app/boards/arm/dao/dao.dtsi b/app/boards/arm/dao/dao.dtsi new file mode 100644 index 00000000..a9011f66 --- /dev/null +++ b/app/boards/arm/dao/dao.dtsi @@ -0,0 +1,136 @@ +/* + * Copyright (c) 2021 Rafael Yumagulov + * + * SPDX-License-Identifier: MIT + */ + +/dts-v1/; +#include + +#include + + +/ { + model = "dao"; + compatible = "dao"; + + chosen { + zephyr,code-partition = &code_partition; + zephyr,sram = &sram0; + zephyr,flash = &flash0; + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + zmk,battery = &vbatt; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <12>; + rows = <4>; + + // | SW19 | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | SW19 | + // | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | | + // | | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | | + // | | | | | SW20 | SW21 | SW22 | | SW22 | SW21 | SW20 | | | | | + map = < + RC(3,0) RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,11) RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6) RC(3,6) + RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,11) RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6) + RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6) + RC(3,3) RC(3,4) RC(3,5) RC(3,11) RC(3,10) RC(3,9) + >; + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + + diode-direction = "col2row"; + row-gpios + = <&gpio0 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 22 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 24 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + }; + + vbatt: vbatt { + compatible = "zmk,battery-voltage-divider"; + label = "VBATT"; + io-channels = <&adc 7>; + output-ohms = <2000000>; + full-ohms = <(2000000 + 820000)>; + }; + +}; + + +&adc { + status = "okay"; +}; + +&gpiote { + status = "okay"; +}; + +&gpio0 { + status = "okay"; +}; + +&gpio1 { + status = "okay"; +}; + +&usbd { + status = "okay"; +}; + +&uart0 { + compatible = "nordic,nrf-uarte"; + status = "okay"; + current-speed = <115200>; + tx-pin = <19>; + rx-pin = <21>; + rts-pin = <23>; + cts-pin = <25>; +}; + + +&flash0 { + /* + * For more information, see: + * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html + */ + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + sd_partition: partition@0 { + label = "softdevice"; + reg = <0x00000000 0x00026000>; + }; + code_partition: partition@26000 { + label = "code_partition"; + reg = <0x00026000 0x000c6000>; + }; + + /* + * The flash starting at 0x000ec000 and ending at + * 0x000f3fff is reserved for use by the application. + */ + + /* + * Storage partition will be used by FCB/LittleFS/NVS + * if enabled. + */ + storage_partition: partition@ec000 { + label = "storage"; + reg = <0x000ec000 0x00008000>; + }; + + boot_partition: partition@f4000 { + label = "adafruit_boot"; + reg = <0x000f4000 0x0000c000>; + }; + }; +}; \ No newline at end of file diff --git a/app/boards/arm/dao/dao.keymap b/app/boards/arm/dao/dao.keymap new file mode 100644 index 00000000..cfcddfaa --- /dev/null +++ b/app/boards/arm/dao/dao.keymap @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2021 Rafael Yumagulov + * + * SPDX-License-Identifier: MIT + */ + +#include +#include +#include + +#define DEF 0 +#define LWR 1 +#define RSE 2 +#define ADJ 3 + +< { quick_tap_ms = <200>; }; +&mt { quick_tap_ms = <200>; }; + +/ { + keymap { + compatible = "zmk,keymap"; + + default_layer { +// ------------------------------------------------------------------------------------------------- +// NOTE: For 44 version you should add map to edge buttons +// ------------------------------------------------------------------------------------------------- +// | | CMD/[ | Q | W | E | R | T | | Y | U | I | O | P | [ | | +// | CTRL/` | A | S | D | F | G | | H | J | K | L | ; | CTRL/' | +// | ALT/- | Z | X | C | V | B | | N | M | , | . | / | ALT/\ | +// | RSE/TAB | SHFT/SPC | LWR/RET | | LWR/ESC | SHFT/BKSP | RSE/DEL | + bindings = < + &none &mt LGUI RBKT &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT &none + &mt LCTRL GRAVE &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &mt RCTRL SQT + &mt LALT MINUS &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mt RALT BSLH + < RSE TAB &mt LSHFT SPACE < LWR RET < LWR ESC &mt RSHFT BSPC < RSE DEL + >; + }; + lower_layer { +// ------------------------------------------------------------------------------------------------- +// NOTE: For 44 version you should add map to edge buttons +// ------------------------------------------------------------------------------------------------- +// | | CMD/F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | +// | CTRL/+ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | CTRL/- | +// | ALT/= | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ALT | +// | ADJ/TAB | | | | | | ADJ/DEL | + bindings = < + &none &mt LGUI F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &none + &mt LCTRL PLUS &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR &mt RCTRL MINUS + &mt LALT EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp RALT + < ADJ TAB &trans &trans &trans &trans < ADJ DEL + >; + }; + + raise_layer { +// ------------------------------------------------------------------------------------------------- +// NOTE: For 44 version you should add map to edge buttons +// ------------------------------------------------------------------------------------------------- +// | | CMD/NLCK | / | 7 | 8 | 9 | - | | VOL_UP | HOME | PSCRN | PGUP | SLCK | CAPS | | +// | CTRL/= | * | 4 | 5 | 6 | + | | MUTE | LEFT | UP | RHGT | INS |CTRL/CTXMENU| +// | ALT | 0 | 1 | 2 | 3 | . | | VOL_DN | END | DOWN | PGDN | PAUS | ALT | +// | | | ADJ/ENT | | ADJ/ESC | | | + bindings = < + &none &mt LGUI KP_NUM &kp KP_SLASH &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_MINUS &kp C_VOL_UP &kp HOME &kp PSCRN &kp PG_UP &kp SLCK &kp CLCK &none + &mt LCTRL EQUAL &kp KP_MULTIPLY &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_PLUS &kp C_MUTE &kp LEFT &kp UP &kp RIGHT &kp INS &mt RCTRL K_APP + &kp LALT &kp KP_N0 &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_DOT &kp C_VOL_DN &kp END &kp DOWN &kp PG_DN &kp PAUSE_BREAK &kp RALT + &trans &trans < ADJ RET < ADJ ESC &trans &trans + >; + }; + adjust_layer { +// ------------------------------------------------------------------------------------------------- +// NOTE: For 44 version you should add map to edge buttons +// ------------------------------------------------------------------------------------------------- +// | | BTLDR | | | | | | | | | | | | BTLDR | | +// | BT_CLR | BT0 | BT1 | BT2 | BT3 | BT4 | | BT4 | BT3 | BT2 | BT1 | BT0 | BT_CLR | +// | RST | | | | | | | | | | | | RST | +// | | | | | | | | + bindings = < + &none &bootloader &none &none &none &none &none &none &none &none &none &none &bootloader &none + &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 + &reset &none &none &none &none &none &none &none &none &none &none &reset + &trans &none &trans &none &trans &trans + >; + }; + }; +}; diff --git a/app/boards/arm/dao/dao.yaml b/app/boards/arm/dao/dao.yaml new file mode 100644 index 00000000..755b0c90 --- /dev/null +++ b/app/boards/arm/dao/dao.yaml @@ -0,0 +1,18 @@ +identifier: dao +name: Dao +type: keyboard +arch: arm +toolchain: + - zephyr + - gnuarmemb + - xtools +supported: + - adc + - usb_device + - ble + - ieee802154 + - pwm + - watchdog + - kscan + - nvs + - can diff --git a/app/boards/arm/dao/dao.zmk.yml b/app/boards/arm/dao/dao.zmk.yml new file mode 100644 index 00000000..8c3f49be --- /dev/null +++ b/app/boards/arm/dao/dao.zmk.yml @@ -0,0 +1,15 @@ +file_format: "1" +id: dao +name: Dao +url: https://github.com/yumagulovrn/dao-choc-ble +type: board +arch: arm +features: + - keys +outputs: + - usb + - ble +siblings: + - dao_left + - dao_right + diff --git a/app/boards/arm/dao/dao_left.dts b/app/boards/arm/dao/dao_left.dts new file mode 100644 index 00000000..9bb7b6b3 --- /dev/null +++ b/app/boards/arm/dao/dao_left.dts @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 Rafael Yumagulov + * + * SPDX-License-Identifier: MIT + */ + +#include "dao.dtsi" + +&kscan0 { + col-gpios + = <&gpio0 12 GPIO_ACTIVE_HIGH> + , <&gpio1 9 GPIO_ACTIVE_HIGH> + , <&gpio0 8 GPIO_ACTIVE_HIGH> + , <&gpio0 13 GPIO_ACTIVE_HIGH> + , <&gpio0 15 GPIO_ACTIVE_HIGH> + , <&gpio0 20 GPIO_ACTIVE_HIGH> + ; +}; diff --git a/app/boards/arm/dao/dao_left_defconfig b/app/boards/arm/dao/dao_left_defconfig new file mode 100644 index 00000000..7881f6c6 --- /dev/null +++ b/app/boards/arm/dao/dao_left_defconfig @@ -0,0 +1,41 @@ +# SPDX-License-Identifier: MIT + +CONFIG_ZMK_SPLIT_ROLE_CENTRAL=y + +CONFIG_SOC_SERIES_NRF52X=y +CONFIG_SOC_NRF52840_QIAA=y +CONFIG_BOARD_DAO_LEFT=y +CONFIG_ZMK_SPLIT=y +CONFIG_ZMK_SLEEP=y + +# Enable MPU +CONFIG_ARM_MPU=y + +# enable GPIO +CONFIG_GPIO=y + +# Enable writing to flash +CONFIG_USE_DT_CODE_PARTITION=y +CONFIG_MPU_ALLOW_FLASH_WRITE=y +CONFIG_NVS=y +CONFIG_SETTINGS_NVS=y +CONFIG_FLASH=y +CONFIG_FLASH_PAGE_LAYOUT=y +CONFIG_FLASH_MAP=y + +# Enable external crystal +CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y +CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y + +# # Turn on logging, and set ZMK logging to debug output +# CONFIG_ZMK_USB_LOGGING=y + +# # Turn on logging, and set ZMK logging to debug output +# CONFIG_LOG=y +# CONFIG_ZMK_LOG_LEVEL_DBG=y + +# Turn on uf2 build +CONFIG_BUILD_OUTPUT_UF2=y + +# Increase transmit power level +CONFIG_BT_CTLR_TX_PWR_PLUS_8=y diff --git a/app/boards/arm/dao/dao_right.dts b/app/boards/arm/dao/dao_right.dts new file mode 100644 index 00000000..68d8f71a --- /dev/null +++ b/app/boards/arm/dao/dao_right.dts @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2021 Rafael Yumagulov + * + * SPDX-License-Identifier: MIT + */ + +#include "dao.dtsi" + +&default_transform { + col-offset = <6>; +}; + +&kscan0 { + col-gpios + = <&gpio0 12 GPIO_ACTIVE_HIGH> + , <&gpio1 9 GPIO_ACTIVE_HIGH> + , <&gpio0 8 GPIO_ACTIVE_HIGH> + , <&gpio0 13 GPIO_ACTIVE_HIGH> + , <&gpio0 15 GPIO_ACTIVE_HIGH> + , <&gpio0 20 GPIO_ACTIVE_HIGH> + ; +}; diff --git a/app/boards/arm/dao/dao_right_defconfig b/app/boards/arm/dao/dao_right_defconfig new file mode 100644 index 00000000..f743acfe --- /dev/null +++ b/app/boards/arm/dao/dao_right_defconfig @@ -0,0 +1,39 @@ +# SPDX-License-Identifier: MIT + +CONFIG_SOC_SERIES_NRF52X=y +CONFIG_SOC_NRF52840_QIAA=y +CONFIG_BOARD_DAO_RIGHT=y +CONFIG_ZMK_SPLIT=y +CONFIG_ZMK_SLEEP=y + +# Enable MPU +CONFIG_ARM_MPU=y + +# enable GPIO +CONFIG_GPIO=y + +# Enable writing to flash +CONFIG_USE_DT_CODE_PARTITION=y +CONFIG_MPU_ALLOW_FLASH_WRITE=y +CONFIG_NVS=y +CONFIG_SETTINGS_NVS=y +CONFIG_FLASH=y +CONFIG_FLASH_PAGE_LAYOUT=y +CONFIG_FLASH_MAP=y + +# Enable external crystal +CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y +CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y + +# # Turn on logging, and set ZMK logging to debug output +# CONFIG_ZMK_USB_LOGGING=y + +# # Turn on logging, and set ZMK logging to debug output +# CONFIG_LOG=y +# CONFIG_ZMK_LOG_LEVEL_DBG=y + +# Turn on uf2 build +CONFIG_BUILD_OUTPUT_UF2=y + +# Increase transmit power level +CONFIG_BT_CTLR_TX_PWR_PLUS_8=y From 95fb340d6c5dbe3e2b860f1d1efc90e28ca2b9ca Mon Sep 17 00:00:00 2001 From: Dmitry Kupriyanov Date: Sat, 14 Jan 2023 16:24:40 +0400 Subject: [PATCH 02/15] fit lint --- app/boards/arm/dao/dao.zmk.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/boards/arm/dao/dao.zmk.yml b/app/boards/arm/dao/dao.zmk.yml index 8c3f49be..18face8a 100644 --- a/app/boards/arm/dao/dao.zmk.yml +++ b/app/boards/arm/dao/dao.zmk.yml @@ -1,7 +1,7 @@ file_format: "1" -id: dao -name: Dao -url: https://github.com/yumagulovrn/dao-choc-ble +id: dao +name: Dao +url: https://github.com/yumagulovrn/dao-choc-ble type: board arch: arm features: @@ -12,4 +12,3 @@ outputs: siblings: - dao_left - dao_right - From 478ad68b0abd0892ab17df15e936e22226677e94 Mon Sep 17 00:00:00 2001 From: Dmitry Kupriyanov Date: Sat, 14 Jan 2023 16:38:49 +0400 Subject: [PATCH 03/15] Fixed formatting default config. --- app/boards/arm/dao/dao.keymap | 139 ++++++++++++++++++---------------- 1 file changed, 75 insertions(+), 64 deletions(-) diff --git a/app/boards/arm/dao/dao.keymap b/app/boards/arm/dao/dao.keymap index cfcddfaa..b70a8bcf 100644 --- a/app/boards/arm/dao/dao.keymap +++ b/app/boards/arm/dao/dao.keymap @@ -13,73 +13,84 @@ #define RSE 2 #define ADJ 3 -< { quick_tap_ms = <200>; }; -&mt { quick_tap_ms = <200>; }; +< { + quick_tap_ms = <200>; +}; + +&mt { + quick_tap_ms = <200>; +}; / { - keymap { - compatible = "zmk,keymap"; + keymap { + compatible = "zmk,keymap"; - default_layer { -// ------------------------------------------------------------------------------------------------- -// NOTE: For 44 version you should add map to edge buttons -// ------------------------------------------------------------------------------------------------- -// | | CMD/[ | Q | W | E | R | T | | Y | U | I | O | P | [ | | -// | CTRL/` | A | S | D | F | G | | H | J | K | L | ; | CTRL/' | -// | ALT/- | Z | X | C | V | B | | N | M | , | . | / | ALT/\ | -// | RSE/TAB | SHFT/SPC | LWR/RET | | LWR/ESC | SHFT/BKSP | RSE/DEL | - bindings = < - &none &mt LGUI RBKT &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT &none - &mt LCTRL GRAVE &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &mt RCTRL SQT - &mt LALT MINUS &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mt RALT BSLH - < RSE TAB &mt LSHFT SPACE < LWR RET < LWR ESC &mt RSHFT BSPC < RSE DEL - >; - }; - lower_layer { -// ------------------------------------------------------------------------------------------------- -// NOTE: For 44 version you should add map to edge buttons -// ------------------------------------------------------------------------------------------------- -// | | CMD/F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | -// | CTRL/+ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | CTRL/- | -// | ALT/= | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ALT | -// | ADJ/TAB | | | | | | ADJ/DEL | - bindings = < - &none &mt LGUI F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &none - &mt LCTRL PLUS &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR &mt RCTRL MINUS - &mt LALT EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp RALT - < ADJ TAB &trans &trans &trans &trans < ADJ DEL - >; - }; + default_layer { + // ------------------------------------------------------------------------------------------------- + // NOTE: For 44 version you should add map to edge buttons + // ------------------------------------------------------------------------------------------------- + // | | CMD/[ | Q | W | E | R | T | | Y | U | I | O | P | [ | | + // | CTRL/` | A | S | D | F | G | | H | J | K | L | ; | CTRL/' | + // | ALT/- | Z | X | C | V | B | | N | M | , | . | / | ALT/\ | + // | RSE/TAB | SHFT/SPC | LWR/RET | | LWR/ESC | SHFT/BKSP | RSE/DEL | - raise_layer { -// ------------------------------------------------------------------------------------------------- -// NOTE: For 44 version you should add map to edge buttons -// ------------------------------------------------------------------------------------------------- -// | | CMD/NLCK | / | 7 | 8 | 9 | - | | VOL_UP | HOME | PSCRN | PGUP | SLCK | CAPS | | -// | CTRL/= | * | 4 | 5 | 6 | + | | MUTE | LEFT | UP | RHGT | INS |CTRL/CTXMENU| -// | ALT | 0 | 1 | 2 | 3 | . | | VOL_DN | END | DOWN | PGDN | PAUS | ALT | -// | | | ADJ/ENT | | ADJ/ESC | | | - bindings = < - &none &mt LGUI KP_NUM &kp KP_SLASH &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_MINUS &kp C_VOL_UP &kp HOME &kp PSCRN &kp PG_UP &kp SLCK &kp CLCK &none - &mt LCTRL EQUAL &kp KP_MULTIPLY &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_PLUS &kp C_MUTE &kp LEFT &kp UP &kp RIGHT &kp INS &mt RCTRL K_APP - &kp LALT &kp KP_N0 &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_DOT &kp C_VOL_DN &kp END &kp DOWN &kp PG_DN &kp PAUSE_BREAK &kp RALT - &trans &trans < ADJ RET < ADJ ESC &trans &trans - >; - }; - adjust_layer { -// ------------------------------------------------------------------------------------------------- -// NOTE: For 44 version you should add map to edge buttons -// ------------------------------------------------------------------------------------------------- -// | | BTLDR | | | | | | | | | | | | BTLDR | | -// | BT_CLR | BT0 | BT1 | BT2 | BT3 | BT4 | | BT4 | BT3 | BT2 | BT1 | BT0 | BT_CLR | -// | RST | | | | | | | | | | | | RST | -// | | | | | | | | - bindings = < - &none &bootloader &none &none &none &none &none &none &none &none &none &none &bootloader &none - &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 - &reset &none &none &none &none &none &none &none &none &none &none &reset - &trans &none &trans &none &trans &trans - >; - }; + bindings = < + &none &mt LGUI RBKT &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT &none + &mt LCTRL GRAVE &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &mt RCTRL SQT + &mt LALT MINUS &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mt RALT BSLH + < 2 TAB &mt LSHFT SPACE < 1 RET < 1 ESC &mt RSHFT BSPC < 2 DEL + >; }; + + lower_layer { + // ------------------------------------------------------------------------------------------------- + // NOTE: For 44 version you should add map to edge buttons + // ------------------------------------------------------------------------------------------------- + // | | CMD/F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | + // | CTRL/+ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | CTRL/- | + // | ALT/= | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ALT | + // | ADJ/TAB | | | | | | ADJ/DEL | + + bindings = < + &none &mt LGUI F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &none + &mt LCTRL PLUS &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR &mt RCTRL MINUS + &mt LALT EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp RALT + < 3 TAB &trans &trans &trans &trans < 3 DEL + >; + }; + + raise_layer { + // ------------------------------------------------------------------------------------------------- + // NOTE: For 44 version you should add map to edge buttons + // ------------------------------------------------------------------------------------------------- + // | | CMD/NLCK | / | 7 | 8 | 9 | - | | VOL_UP | HOME | PSCRN | PGUP | SLCK | CAPS | | + // | CTRL/= | * | 4 | 5 | 6 | + | | MUTE | LEFT | UP | RHGT | INS |CTRL/CTXMENU| + // | ALT | 0 | 1 | 2 | 3 | . | | VOL_DN | END | DOWN | PGDN | PAUS | ALT | + // | | | ADJ/ENT | | ADJ/ESC | | | + + bindings = < + &none &mt LGUI KP_NUM &kp KP_SLASH &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_MINUS &kp C_VOL_UP &kp HOME &kp PSCRN &kp PG_UP &kp SLCK &kp CLCK &none + &mt LCTRL EQUAL &kp KP_MULTIPLY &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_PLUS &kp C_MUTE &kp LEFT &kp UP &kp RIGHT &kp INS &mt RCTRL K_APP + &kp LALT &kp KP_N0 &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_DOT &kp C_VOL_DN &kp END &kp DOWN &kp PG_DN &kp PAUSE_BREAK &kp RALT + &trans &trans < 3 RET < 3 ESC &trans &trans + >; + }; + + adjust_layer { + // ------------------------------------------------------------------------------------------------- + // NOTE: For 44 version you should add map to edge buttons + // ------------------------------------------------------------------------------------------------- + // | | BTLDR | | | | | | | | | | | | BTLDR | | + // | BT_CLR | BT0 | BT1 | BT2 | BT3 | BT4 | | BT4 | BT3 | BT2 | BT1 | BT0 | BT_CLR | + // | RST | | | | | | | | | | | | RST | + // | | | | | | | | + + bindings = < + &none &bootloader &reset &none &none &none &none &none &none &none &none &none &bootloader &none + &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 + &reset &none &none &none &none &none &none &none &none &none &none &reset + &trans &none &trans &none &trans &trans + >; + }; + }; }; From 77262f6aefcd9eec6f09e2d5b562249fabed4368 Mon Sep 17 00:00:00 2001 From: Dmitry Kupriyanov Date: Sat, 14 Jan 2023 16:47:46 +0400 Subject: [PATCH 04/15] Copyrights --- app/boards/arm/dao/Kconfig | 2 +- app/boards/arm/dao/Kconfig.board | 2 +- app/boards/arm/dao/Kconfig.defconfig | 2 +- app/boards/arm/dao/dao.dtsi | 2 +- app/boards/arm/dao/dao.keymap | 4 ++-- app/boards/arm/dao/dao_left.dts | 2 +- app/boards/arm/dao/dao_right.dts | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/boards/arm/dao/Kconfig b/app/boards/arm/dao/Kconfig index 4bc7e0de..14bc14c9 100644 --- a/app/boards/arm/dao/Kconfig +++ b/app/boards/arm/dao/Kconfig @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Rafael Yumagulov +# Copyright (c) 2023 ZMK Contributors # SPDX-License-Identifier: MIT config BOARD_ENABLE_DCDC diff --git a/app/boards/arm/dao/Kconfig.board b/app/boards/arm/dao/Kconfig.board index accc3e29..777da473 100644 --- a/app/boards/arm/dao/Kconfig.board +++ b/app/boards/arm/dao/Kconfig.board @@ -1,6 +1,6 @@ # Dao board configuration -# Copyright (c) 2021 Rafael Yumagulov +# Copyright (c) 2023 ZMK Contributors # SPDX-License-Identifier: MIT config BOARD_DAO_LEFT diff --git a/app/boards/arm/dao/Kconfig.defconfig b/app/boards/arm/dao/Kconfig.defconfig index 5a2407f0..1e80c3bc 100644 --- a/app/boards/arm/dao/Kconfig.defconfig +++ b/app/boards/arm/dao/Kconfig.defconfig @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Rafael Yumagulov +# Copyright (c) 2023 ZMK Contributors # SPDX-License-Identifier: MIT if BOARD_DAO_LEFT diff --git a/app/boards/arm/dao/dao.dtsi b/app/boards/arm/dao/dao.dtsi index a9011f66..7b9716f9 100644 --- a/app/boards/arm/dao/dao.dtsi +++ b/app/boards/arm/dao/dao.dtsi @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Rafael Yumagulov + * Copyright (c) 2023 ZMK Contributors * * SPDX-License-Identifier: MIT */ diff --git a/app/boards/arm/dao/dao.keymap b/app/boards/arm/dao/dao.keymap index b70a8bcf..a276f602 100644 --- a/app/boards/arm/dao/dao.keymap +++ b/app/boards/arm/dao/dao.keymap @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Rafael Yumagulov + * Copyright (c) 2023 ZMK Contributors * * SPDX-License-Identifier: MIT */ @@ -93,4 +93,4 @@ >; }; }; -}; +}; \ No newline at end of file diff --git a/app/boards/arm/dao/dao_left.dts b/app/boards/arm/dao/dao_left.dts index 9bb7b6b3..1d443dd0 100644 --- a/app/boards/arm/dao/dao_left.dts +++ b/app/boards/arm/dao/dao_left.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Rafael Yumagulov + * Copyright (c) 2023 ZMK Contributors * * SPDX-License-Identifier: MIT */ diff --git a/app/boards/arm/dao/dao_right.dts b/app/boards/arm/dao/dao_right.dts index 68d8f71a..6878f6ff 100644 --- a/app/boards/arm/dao/dao_right.dts +++ b/app/boards/arm/dao/dao_right.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Rafael Yumagulov + * Copyright (c) 2023 ZMK Contributors * * SPDX-License-Identifier: MIT */ From 1ddc9f9153c67bec4bcf7d837c617c711f317678 Mon Sep 17 00:00:00 2001 From: Dmitry Kupriyanov Date: Mon, 16 Jan 2023 12:45:50 +0400 Subject: [PATCH 05/15] Address comments --- app/boards/arm/dao/Kconfig.defconfig | 12 ++---------- app/boards/arm/dao/dao.conf | 5 +++++ app/boards/arm/dao/dao.dtsi | 17 +++++++++++++++++ app/boards/arm/dao/dao_left_defconfig | 5 +---- app/boards/arm/dao/dao_right_defconfig | 3 --- 5 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 app/boards/arm/dao/dao.conf diff --git a/app/boards/arm/dao/Kconfig.defconfig b/app/boards/arm/dao/Kconfig.defconfig index 1e80c3bc..b04b6e1e 100644 --- a/app/boards/arm/dao/Kconfig.defconfig +++ b/app/boards/arm/dao/Kconfig.defconfig @@ -6,19 +6,11 @@ if BOARD_DAO_LEFT config ZMK_KEYBOARD_NAME default "Dao" - config ZMK_SPLIT_BLE_ROLE_CENTRAL + config ZMK_SPLIT_ROLE_CENTRAL default y endif # BOARD_DAO_LEFT -if BOARD_DAO_RIGHT - - config ZMK_KEYBOARD_NAME - default "Dao Right" - -endif # BOARD_DAO_RIGHT - - if BOARD_DAO_LEFT || BOARD_DAO_RIGHT config BOARD @@ -49,4 +41,4 @@ config USB_DEVICE_STACK endif # USB -endif # BOARD_DAO_LEFT || BOARD_DAO_RIGHT +endif # BOARD_DAO_LEFT || BOARD_DAO_RIGHT \ No newline at end of file diff --git a/app/boards/arm/dao/dao.conf b/app/boards/arm/dao/dao.conf new file mode 100644 index 00000000..e3d26480 --- /dev/null +++ b/app/boards/arm/dao/dao.conf @@ -0,0 +1,5 @@ +# Turn on logging, and set ZMK logging to debug output +# CONFIG_ZMK_USB_LOGGING=y + +# Increase transmit power level +CONFIG_BT_CTLR_TX_PWR_PLUS_8=y \ No newline at end of file diff --git a/app/boards/arm/dao/dao.dtsi b/app/boards/arm/dao/dao.dtsi index 7b9716f9..be78e489 100644 --- a/app/boards/arm/dao/dao.dtsi +++ b/app/boards/arm/dao/dao.dtsi @@ -40,6 +40,23 @@ >; }; + less_key_transform: keymap_transform_1 { + 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 | + // | | | | SW20 | SW21 | SW22 | | SW22 | SW21 | SW20 | | | | + map = < + RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,11) RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6) + RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,11) RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6) + RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6) + RC(3,3) RC(3,4) RC(3,5) RC(3,11) RC(3,10) RC(3,9) + >; + } + kscan0: kscan { compatible = "zmk,kscan-gpio-matrix"; label = "KSCAN"; diff --git a/app/boards/arm/dao/dao_left_defconfig b/app/boards/arm/dao/dao_left_defconfig index 7881f6c6..6061ea11 100644 --- a/app/boards/arm/dao/dao_left_defconfig +++ b/app/boards/arm/dao/dao_left_defconfig @@ -35,7 +35,4 @@ CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y # CONFIG_ZMK_LOG_LEVEL_DBG=y # Turn on uf2 build -CONFIG_BUILD_OUTPUT_UF2=y - -# Increase transmit power level -CONFIG_BT_CTLR_TX_PWR_PLUS_8=y +CONFIG_BUILD_OUTPUT_UF2=y \ No newline at end of file diff --git a/app/boards/arm/dao/dao_right_defconfig b/app/boards/arm/dao/dao_right_defconfig index f743acfe..1c1cee39 100644 --- a/app/boards/arm/dao/dao_right_defconfig +++ b/app/boards/arm/dao/dao_right_defconfig @@ -34,6 +34,3 @@ CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y # Turn on uf2 build CONFIG_BUILD_OUTPUT_UF2=y - -# Increase transmit power level -CONFIG_BT_CTLR_TX_PWR_PLUS_8=y From ee8e4e2ef4e6c576abe36e2b248a24097c251d48 Mon Sep 17 00:00:00 2001 From: Dmitry Kupriyanov Date: Mon, 16 Jan 2023 12:50:11 +0400 Subject: [PATCH 06/15] fixup --- app/boards/arm/dao/dao.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/arm/dao/dao.dtsi b/app/boards/arm/dao/dao.dtsi index be78e489..9634c884 100644 --- a/app/boards/arm/dao/dao.dtsi +++ b/app/boards/arm/dao/dao.dtsi @@ -55,7 +55,7 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6) RC(3,3) RC(3,4) RC(3,5) RC(3,11) RC(3,10) RC(3,9) >; - } + }; kscan0: kscan { compatible = "zmk,kscan-gpio-matrix"; From 07d82bed275972430888443cc93178825e6e9137 Mon Sep 17 00:00:00 2001 From: Dmitry Kupriyanov Date: Mon, 16 Jan 2023 13:22:17 +0400 Subject: [PATCH 07/15] Added chosen node to keymap. --- app/boards/arm/dao/dao.keymap | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/boards/arm/dao/dao.keymap b/app/boards/arm/dao/dao.keymap index a276f602..957200ed 100644 --- a/app/boards/arm/dao/dao.keymap +++ b/app/boards/arm/dao/dao.keymap @@ -21,6 +21,13 @@ quick_tap_ms = <200>; }; +/ { + chosen { + zmk,matrix_transform = &default_transform; + //zmk,matrix_transform = &less_key_transform; + }; +}; + / { keymap { compatible = "zmk,keymap"; From 5aabcba10c443d1da82813eff331b8cf351f7dd9 Mon Sep 17 00:00:00 2001 From: Dmitry Kupriyanov Date: Mon, 16 Jan 2023 13:28:46 +0400 Subject: [PATCH 08/15] Clean up --- app/boards/arm/dao/dao.keymap | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/boards/arm/dao/dao.keymap b/app/boards/arm/dao/dao.keymap index 957200ed..2cb22a40 100644 --- a/app/boards/arm/dao/dao.keymap +++ b/app/boards/arm/dao/dao.keymap @@ -33,9 +33,6 @@ compatible = "zmk,keymap"; default_layer { - // ------------------------------------------------------------------------------------------------- - // NOTE: For 44 version you should add map to edge buttons - // ------------------------------------------------------------------------------------------------- // | | CMD/[ | Q | W | E | R | T | | Y | U | I | O | P | [ | | // | CTRL/` | A | S | D | F | G | | H | J | K | L | ; | CTRL/' | // | ALT/- | Z | X | C | V | B | | N | M | , | . | / | ALT/\ | @@ -50,9 +47,6 @@ }; lower_layer { - // ------------------------------------------------------------------------------------------------- - // NOTE: For 44 version you should add map to edge buttons - // ------------------------------------------------------------------------------------------------- // | | CMD/F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | // | CTRL/+ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | CTRL/- | // | ALT/= | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ALT | @@ -67,9 +61,6 @@ }; raise_layer { - // ------------------------------------------------------------------------------------------------- - // NOTE: For 44 version you should add map to edge buttons - // ------------------------------------------------------------------------------------------------- // | | CMD/NLCK | / | 7 | 8 | 9 | - | | VOL_UP | HOME | PSCRN | PGUP | SLCK | CAPS | | // | CTRL/= | * | 4 | 5 | 6 | + | | MUTE | LEFT | UP | RHGT | INS |CTRL/CTXMENU| // | ALT | 0 | 1 | 2 | 3 | . | | VOL_DN | END | DOWN | PGDN | PAUS | ALT | @@ -84,9 +75,6 @@ }; adjust_layer { - // ------------------------------------------------------------------------------------------------- - // NOTE: For 44 version you should add map to edge buttons - // ------------------------------------------------------------------------------------------------- // | | BTLDR | | | | | | | | | | | | BTLDR | | // | BT_CLR | BT0 | BT1 | BT2 | BT3 | BT4 | | BT4 | BT3 | BT2 | BT1 | BT0 | BT_CLR | // | RST | | | | | | | | | | | | RST | From a6d766251c9c3a32f42df8c39b76da1ecb3143fb Mon Sep 17 00:00:00 2001 From: Dmitry Kupriyanov Date: Mon, 16 Jan 2023 15:24:19 +0400 Subject: [PATCH 09/15] clean up --- app/boards/arm/dao/dao.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/app/boards/arm/dao/dao.dtsi b/app/boards/arm/dao/dao.dtsi index 9634c884..227b7ebb 100644 --- a/app/boards/arm/dao/dao.dtsi +++ b/app/boards/arm/dao/dao.dtsi @@ -19,7 +19,6 @@ zephyr,sram = &sram0; zephyr,flash = &flash0; zmk,kscan = &kscan0; - zmk,matrix_transform = &default_transform; zmk,battery = &vbatt; }; From fa334fe25f3da5497cc3b9ba3957a2c702785609 Mon Sep 17 00:00:00 2001 From: Dmitry Kupriyanov Date: Mon, 16 Jan 2023 15:36:17 +0400 Subject: [PATCH 10/15] more clean up --- app/boards/arm/dao/dao_right.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/boards/arm/dao/dao_right.dts b/app/boards/arm/dao/dao_right.dts index 6878f6ff..0684efeb 100644 --- a/app/boards/arm/dao/dao_right.dts +++ b/app/boards/arm/dao/dao_right.dts @@ -10,6 +10,10 @@ col-offset = <6>; }; +&less_key_transform { + col-offset = <6>; +}; + &kscan0 { col-gpios = <&gpio0 12 GPIO_ACTIVE_HIGH> From 5e2d8b5d1feef5b49fc50a3908eae45eb436109a Mon Sep 17 00:00:00 2001 From: Dmitry Kupriyanov Date: Wed, 18 Jan 2023 10:57:20 +0400 Subject: [PATCH 11/15] Fixed notes --- app/boards/arm/dao/Kconfig.defconfig | 4 ++-- app/boards/arm/dao/dao.dtsi | 3 ++- app/boards/arm/dao/dao.keymap | 8 -------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/app/boards/arm/dao/Kconfig.defconfig b/app/boards/arm/dao/Kconfig.defconfig index b04b6e1e..5028b8e8 100644 --- a/app/boards/arm/dao/Kconfig.defconfig +++ b/app/boards/arm/dao/Kconfig.defconfig @@ -3,10 +3,10 @@ if BOARD_DAO_LEFT - config ZMK_KEYBOARD_NAME +config ZMK_KEYBOARD_NAME default "Dao" - config ZMK_SPLIT_ROLE_CENTRAL +config ZMK_SPLIT_ROLE_CENTRAL default y endif # BOARD_DAO_LEFT diff --git a/app/boards/arm/dao/dao.dtsi b/app/boards/arm/dao/dao.dtsi index 227b7ebb..4d6d3e15 100644 --- a/app/boards/arm/dao/dao.dtsi +++ b/app/boards/arm/dao/dao.dtsi @@ -19,12 +19,13 @@ zephyr,sram = &sram0; zephyr,flash = &flash0; zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; zmk,battery = &vbatt; }; default_transform: keymap_transform_0 { compatible = "zmk,matrix-transform"; - columns = <12>; + columns = <14>; rows = <4>; // | SW19 | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | SW19 | diff --git a/app/boards/arm/dao/dao.keymap b/app/boards/arm/dao/dao.keymap index 2cb22a40..b2d7e141 100644 --- a/app/boards/arm/dao/dao.keymap +++ b/app/boards/arm/dao/dao.keymap @@ -13,14 +13,6 @@ #define RSE 2 #define ADJ 3 -< { - quick_tap_ms = <200>; -}; - -&mt { - quick_tap_ms = <200>; -}; - / { chosen { zmk,matrix_transform = &default_transform; From c4688c9cdc92be5cffc922a542d7061ecff670ab Mon Sep 17 00:00:00 2001 From: Dmitry Kupriyanov Date: Sun, 12 Mar 2023 23:58:37 +0400 Subject: [PATCH 12/15] Changed default matrix transform. Bring back mt and lt macro. --- app/boards/arm/dao/dao.dtsi | 36 +++++++-------- app/boards/arm/dao/dao.keymap | 76 ++++++++++++++++++-------------- app/boards/arm/dao/dao_right.dts | 2 +- 3 files changed, 61 insertions(+), 53 deletions(-) diff --git a/app/boards/arm/dao/dao.dtsi b/app/boards/arm/dao/dao.dtsi index 4d6d3e15..5cd5ab0b 100644 --- a/app/boards/arm/dao/dao.dtsi +++ b/app/boards/arm/dao/dao.dtsi @@ -24,23 +24,6 @@ }; default_transform: keymap_transform_0 { - compatible = "zmk,matrix-transform"; - columns = <14>; - rows = <4>; - - // | SW19 | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | SW19 | - // | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | | - // | | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | | - // | | | | | SW20 | SW21 | SW22 | | SW22 | SW21 | SW20 | | | | | - map = < - RC(3,0) RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,11) RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6) RC(3,6) - RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,11) RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6) - RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6) - RC(3,3) RC(3,4) RC(3,5) RC(3,11) RC(3,10) RC(3,9) - >; - }; - - less_key_transform: keymap_transform_1 { compatible = "zmk,matrix-transform"; columns = <12>; rows = <4>; @@ -57,6 +40,23 @@ >; }; + extra_keys_transform: keymap_transform_1 { + compatible = "zmk,matrix-transform"; + columns = <14>; + rows = <4>; + + // | SW19 | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | SW19 | + // | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | | + // | | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | | + // | | | | | SW20 | SW21 | SW22 | | SW22 | SW21 | SW20 | | | | | + map = < + RC(3,0) RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,11) RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6) RC(3,6) + RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,11) RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6) + RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6) + RC(3,3) RC(3,4) RC(3,5) RC(3,11) RC(3,10) RC(3,9) + >; + }; + kscan0: kscan { compatible = "zmk,kscan-gpio-matrix"; label = "KSCAN"; @@ -150,4 +150,4 @@ reg = <0x000f4000 0x0000c000>; }; }; -}; \ No newline at end of file +}; diff --git a/app/boards/arm/dao/dao.keymap b/app/boards/arm/dao/dao.keymap index b2d7e141..e550f8af 100644 --- a/app/boards/arm/dao/dao.keymap +++ b/app/boards/arm/dao/dao.keymap @@ -13,10 +13,18 @@ #define RSE 2 #define ADJ 3 +< { + quick_tap_ms = <220>; +}; + +&mt { + quick_tap_ms = <220>; +}; + / { chosen { zmk,matrix_transform = &default_transform; - //zmk,matrix_transform = &less_key_transform; + //zmk,matrix_transform = &extra_keys_transform; }; }; @@ -25,59 +33,59 @@ compatible = "zmk,keymap"; default_layer { - // | | CMD/[ | Q | W | E | R | T | | Y | U | I | O | P | [ | | - // | CTRL/` | A | S | D | F | G | | H | J | K | L | ; | CTRL/' | - // | ALT/- | Z | X | C | V | B | | N | M | , | . | / | ALT/\ | - // | RSE/TAB | SHFT/SPC | LWR/RET | | LWR/ESC | SHFT/BKSP | RSE/DEL | + // | CMD/[ | Q | W | E | R | T | | Y | U | I | O | P | [ | + // | CTRL/` | A | S | D | F | G | | H | J | K | L | ; | CTRL/' | + // | ALT/- | Z | X | C | V | B | | N | M | , | . | / | ALT/\ | + // | RSE/TAB | SHFT/SPC | LWR/RET | | LWR/ESC | SHFT/BKSP | RSE/DEL | bindings = < - &none &mt LGUI RBKT &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT &none - &mt LCTRL GRAVE &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &mt RCTRL SQT - &mt LALT MINUS &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mt RALT BSLH - < 2 TAB &mt LSHFT SPACE < 1 RET < 1 ESC &mt RSHFT BSPC < 2 DEL + &mt LGUI RBKT &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT + &mt LCTRL GRAVE &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &mt RCTRL SQT + &mt LALT MINUS &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mt RALT BSLH + < 2 TAB &mt LSHFT SPACE < 1 RET < 1 ESC &mt RSHFT BSPC < 2 DEL >; }; lower_layer { - // | | CMD/F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | - // | CTRL/+ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | CTRL/- | - // | ALT/= | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ALT | - // | ADJ/TAB | | | | | | ADJ/DEL | + // | CMD/F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | + // | CTRL/+ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | CTRL/- | + // | ALT/= | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ALT | + // | ADJ/TAB | | | | | | ADJ/DEL | bindings = < - &none &mt LGUI F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &none - &mt LCTRL PLUS &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR &mt RCTRL MINUS - &mt LALT EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp RALT - < 3 TAB &trans &trans &trans &trans < 3 DEL + &mt LGUI F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 + &mt LCTRL PLUS &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR &mt RCTRL MINUS + &mt LALT EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp RALT + < 3 TAB &trans &trans &trans &trans < 3 DEL >; }; raise_layer { - // | | CMD/NLCK | / | 7 | 8 | 9 | - | | VOL_UP | HOME | PSCRN | PGUP | SLCK | CAPS | | - // | CTRL/= | * | 4 | 5 | 6 | + | | MUTE | LEFT | UP | RHGT | INS |CTRL/CTXMENU| - // | ALT | 0 | 1 | 2 | 3 | . | | VOL_DN | END | DOWN | PGDN | PAUS | ALT | - // | | | ADJ/ENT | | ADJ/ESC | | | + // | CMD/NLCK | / | 7 | 8 | 9 | - | | VOL_UP | HOME | PSCRN | PGUP | SLCK | CAPS | + // | CTRL/= | * | 4 | 5 | 6 | + | | MUTE | LEFT | UP | RHGT | INS |CTRL/CTXMENU| + // | ALT | 0 | 1 | 2 | 3 | . | | VOL_DN | END | DOWN | PGDN | PAUS | ALT | + // | | | ADJ/ENT | | ADJ/ESC | | | bindings = < - &none &mt LGUI KP_NUM &kp KP_SLASH &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_MINUS &kp C_VOL_UP &kp HOME &kp PSCRN &kp PG_UP &kp SLCK &kp CLCK &none - &mt LCTRL EQUAL &kp KP_MULTIPLY &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_PLUS &kp C_MUTE &kp LEFT &kp UP &kp RIGHT &kp INS &mt RCTRL K_APP - &kp LALT &kp KP_N0 &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_DOT &kp C_VOL_DN &kp END &kp DOWN &kp PG_DN &kp PAUSE_BREAK &kp RALT - &trans &trans < 3 RET < 3 ESC &trans &trans + &mt LGUI KP_NUM &kp KP_SLASH &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_MINUS &kp C_VOL_UP &kp HOME &kp PSCRN &kp PG_UP &kp SLCK &kp CLCK + &mt LCTRL EQUAL &kp KP_MULTIPLY &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_PLUS &kp C_MUTE &kp LEFT &kp UP &kp RIGHT &kp INS &mt RCTRL K_APP + &kp LALT &kp KP_N0 &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_DOT &kp C_VOL_DN &kp END &kp DOWN &kp PG_DN &kp PAUSE_BREAK &kp RALT + &trans &trans < 3 RET < 3 ESC &trans &trans >; }; adjust_layer { - // | | BTLDR | | | | | | | | | | | | BTLDR | | - // | BT_CLR | BT0 | BT1 | BT2 | BT3 | BT4 | | BT4 | BT3 | BT2 | BT1 | BT0 | BT_CLR | - // | RST | | | | | | | | | | | | RST | - // | | | | | | | | + // | BTLDR | | | | | | | | | | | | BTLDR | + // | BT_CLR | BT0 | BT1 | BT2 | BT3 | BT4 | | BT4 | BT3 | BT2 | BT1 | BT0 | BT_CLR | + // | RST | | | | | | | | | | | | RST | + // | | | | | | | | bindings = < - &none &bootloader &reset &none &none &none &none &none &none &none &none &none &bootloader &none - &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 - &reset &none &none &none &none &none &none &none &none &none &none &reset - &trans &none &trans &none &trans &trans + &bootloader &reset &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 + &reset &none &none &none &none &none &none &none &none &none &none &reset + &trans &none &trans &none &trans &trans >; }; }; -}; \ No newline at end of file +}; diff --git a/app/boards/arm/dao/dao_right.dts b/app/boards/arm/dao/dao_right.dts index 0684efeb..786c62b8 100644 --- a/app/boards/arm/dao/dao_right.dts +++ b/app/boards/arm/dao/dao_right.dts @@ -10,7 +10,7 @@ col-offset = <6>; }; -&less_key_transform { +&extra_keys_transform { col-offset = <6>; }; From da1cd1787b1817a100da162be1252fd44b4b8dea Mon Sep 17 00:00:00 2001 From: Dmitry Kupriyanov Date: Fri, 12 May 2023 12:29:59 +0300 Subject: [PATCH 13/15] Change 'reset' to 'sys_reset' --- app/boards/arm/dao/dao.keymap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/boards/arm/dao/dao.keymap b/app/boards/arm/dao/dao.keymap index e550f8af..c10be5de 100644 --- a/app/boards/arm/dao/dao.keymap +++ b/app/boards/arm/dao/dao.keymap @@ -81,9 +81,9 @@ // | | | | | | | | bindings = < - &bootloader &reset &none &none &none &none &none &none &none &none &none &bootloader + &bootloader &sys_reset &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 - &reset &none &none &none &none &none &none &none &none &none &none &reset + &sys_reset &none &none &none &none &none &none &none &none &none &none &sys_reset &trans &none &trans &none &trans &trans >; }; From 94f986898242565ffbc8644aaee1f54e5541590a Mon Sep 17 00:00:00 2001 From: Dmitry Kupriyanov Date: Fri, 12 May 2023 13:25:10 +0300 Subject: [PATCH 14/15] tabs fix --- app/boards/arm/dao/Kconfig | 8 +- app/boards/arm/dao/Kconfig.board | 8 +- app/boards/arm/dao/Kconfig.defconfig | 22 +-- app/boards/arm/dao/dao.dtsi | 191 +++++++++++++-------------- app/boards/arm/dao/dao.keymap | 2 +- app/boards/arm/dao/dao_left.dts | 16 +-- app/boards/arm/dao/dao_right.dts | 20 +-- 7 files changed, 133 insertions(+), 134 deletions(-) diff --git a/app/boards/arm/dao/Kconfig b/app/boards/arm/dao/Kconfig index 14bc14c9..de4d8510 100644 --- a/app/boards/arm/dao/Kconfig +++ b/app/boards/arm/dao/Kconfig @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MIT config BOARD_ENABLE_DCDC - bool "Enable DCDC mode" - select SOC_DCDC_NRF52X - default y - depends on (BOARD_DAO_LEFT || BOARD_DAO_RIGHT) + bool "Enable DCDC mode" + select SOC_DCDC_NRF52X + default y + depends on (BOARD_DAO_LEFT || BOARD_DAO_RIGHT) diff --git a/app/boards/arm/dao/Kconfig.board b/app/boards/arm/dao/Kconfig.board index 777da473..3c91633a 100644 --- a/app/boards/arm/dao/Kconfig.board +++ b/app/boards/arm/dao/Kconfig.board @@ -4,9 +4,9 @@ # SPDX-License-Identifier: MIT config BOARD_DAO_LEFT - bool "dao_left" - depends on SOC_NRF52840_QIAA + bool "dao_left" + depends on SOC_NRF52840_QIAA config BOARD_DAO_RIGHT - bool "dao_right" - depends on SOC_NRF52840_QIAA + bool "dao_right" + depends on SOC_NRF52840_QIAA diff --git a/app/boards/arm/dao/Kconfig.defconfig b/app/boards/arm/dao/Kconfig.defconfig index 5028b8e8..5b0c12c3 100644 --- a/app/boards/arm/dao/Kconfig.defconfig +++ b/app/boards/arm/dao/Kconfig.defconfig @@ -4,41 +4,41 @@ if BOARD_DAO_LEFT config ZMK_KEYBOARD_NAME - default "Dao" + default "Dao" config ZMK_SPLIT_ROLE_CENTRAL - default y + default y endif # BOARD_DAO_LEFT if BOARD_DAO_LEFT || BOARD_DAO_RIGHT config BOARD - default "dao" + default "dao" config ZMK_SPLIT - default y + default y config BT_CTLR - default BT + default BT config ZMK_BLE - default y + default y config ZMK_USB - default y + default y config ZMK_BATTERY_VOLTAGE_DIVIDER - default y + default y if USB config USB_NRFX - default y + default y config USB_DEVICE_STACK - default y + default y endif # USB -endif # BOARD_DAO_LEFT || BOARD_DAO_RIGHT \ No newline at end of file +endif # BOARD_DAO_LEFT || BOARD_DAO_RIGHT diff --git a/app/boards/arm/dao/dao.dtsi b/app/boards/arm/dao/dao.dtsi index 5cd5ab0b..1e4f49d3 100644 --- a/app/boards/arm/dao/dao.dtsi +++ b/app/boards/arm/dao/dao.dtsi @@ -11,143 +11,142 @@ / { - model = "dao"; - compatible = "dao"; + model = "dao"; + compatible = "dao"; - chosen { - zephyr,code-partition = &code_partition; - zephyr,sram = &sram0; - zephyr,flash = &flash0; - zmk,kscan = &kscan0; - zmk,matrix_transform = &default_transform; - zmk,battery = &vbatt; - }; + chosen { + zephyr,code-partition = &code_partition; + zephyr,sram = &sram0; + zephyr,flash = &flash0; + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + zmk,battery = &vbatt; + }; - default_transform: keymap_transform_0 { - compatible = "zmk,matrix-transform"; - columns = <12>; - rows = <4>; + 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 | - // | | | | SW20 | SW21 | SW22 | | SW22 | SW21 | SW20 | | | | - map = < + // | 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 | + // | | | | SW20 | SW21 | SW22 | | SW22 | SW21 | SW20 | | | | + map = < RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,11) RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6) RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,11) RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6) RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6) RC(3,3) RC(3,4) RC(3,5) RC(3,11) RC(3,10) RC(3,9) - >; - }; + >; + }; - extra_keys_transform: keymap_transform_1 { - compatible = "zmk,matrix-transform"; - columns = <14>; - rows = <4>; + extra_keys_transform: keymap_transform_1 { + compatible = "zmk,matrix-transform"; + columns = <14>; + rows = <4>; - // | SW19 | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | SW19 | - // | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | | - // | | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | | - // | | | | | SW20 | SW21 | SW22 | | SW22 | SW21 | SW20 | | | | | - map = < + // | SW19 | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | SW19 | + // | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | | + // | | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | | + // | | | | | SW20 | SW21 | SW22 | | SW22 | SW21 | SW20 | | | | | + map = < RC(3,0) RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,11) RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6) RC(3,6) RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,11) RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6) RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6) RC(3,3) RC(3,4) RC(3,5) RC(3,11) RC(3,10) RC(3,9) - >; - }; + >; + }; - kscan0: kscan { - compatible = "zmk,kscan-gpio-matrix"; - label = "KSCAN"; + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; - diode-direction = "col2row"; - row-gpios - = <&gpio0 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpio0 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpio0 22 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpio0 24 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - ; - }; + diode-direction = "col2row"; + row-gpios + = <&gpio0 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 22 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 24 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + }; - vbatt: vbatt { - compatible = "zmk,battery-voltage-divider"; - label = "VBATT"; - io-channels = <&adc 7>; - output-ohms = <2000000>; - full-ohms = <(2000000 + 820000)>; - }; - + vbatt: vbatt { + compatible = "zmk,battery-voltage-divider"; + label = "VBATT"; + io-channels = <&adc 7>; + output-ohms = <2000000>; + full-ohms = <(2000000 + 820000)>; + }; }; &adc { - status = "okay"; + status = "okay"; }; &gpiote { - status = "okay"; + status = "okay"; }; &gpio0 { - status = "okay"; + status = "okay"; }; &gpio1 { - status = "okay"; + status = "okay"; }; &usbd { - status = "okay"; + status = "okay"; }; &uart0 { - compatible = "nordic,nrf-uarte"; - status = "okay"; - current-speed = <115200>; - tx-pin = <19>; - rx-pin = <21>; - rts-pin = <23>; - cts-pin = <25>; + compatible = "nordic,nrf-uarte"; + status = "okay"; + current-speed = <115200>; + tx-pin = <19>; + rx-pin = <21>; + rts-pin = <23>; + cts-pin = <25>; }; &flash0 { - /* - * For more information, see: - * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html - */ - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; + /* + * For more information, see: + * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html + */ + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - sd_partition: partition@0 { - label = "softdevice"; - reg = <0x00000000 0x00026000>; - }; - code_partition: partition@26000 { - label = "code_partition"; - reg = <0x00026000 0x000c6000>; - }; + sd_partition: partition@0 { + label = "softdevice"; + reg = <0x00000000 0x00026000>; + }; + code_partition: partition@26000 { + label = "code_partition"; + reg = <0x00026000 0x000c6000>; + }; - /* - * The flash starting at 0x000ec000 and ending at - * 0x000f3fff is reserved for use by the application. - */ + /* + * The flash starting at 0x000ec000 and ending at + * 0x000f3fff is reserved for use by the application. + */ - /* - * Storage partition will be used by FCB/LittleFS/NVS - * if enabled. - */ - storage_partition: partition@ec000 { - label = "storage"; - reg = <0x000ec000 0x00008000>; - }; + /* + * Storage partition will be used by FCB/LittleFS/NVS + * if enabled. + */ + storage_partition: partition@ec000 { + label = "storage"; + reg = <0x000ec000 0x00008000>; + }; - boot_partition: partition@f4000 { - label = "adafruit_boot"; - reg = <0x000f4000 0x0000c000>; - }; - }; + boot_partition: partition@f4000 { + label = "adafruit_boot"; + reg = <0x000f4000 0x0000c000>; + }; + }; }; diff --git a/app/boards/arm/dao/dao.keymap b/app/boards/arm/dao/dao.keymap index c10be5de..6046dd3f 100644 --- a/app/boards/arm/dao/dao.keymap +++ b/app/boards/arm/dao/dao.keymap @@ -39,7 +39,7 @@ // | RSE/TAB | SHFT/SPC | LWR/RET | | LWR/ESC | SHFT/BKSP | RSE/DEL | bindings = < - &mt LGUI RBKT &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT + &mt LGUI RBKT &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT &mt LCTRL GRAVE &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &mt RCTRL SQT &mt LALT MINUS &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mt RALT BSLH < 2 TAB &mt LSHFT SPACE < 1 RET < 1 ESC &mt RSHFT BSPC < 2 DEL diff --git a/app/boards/arm/dao/dao_left.dts b/app/boards/arm/dao/dao_left.dts index 1d443dd0..07ce7b33 100644 --- a/app/boards/arm/dao/dao_left.dts +++ b/app/boards/arm/dao/dao_left.dts @@ -7,12 +7,12 @@ #include "dao.dtsi" &kscan0 { - col-gpios - = <&gpio0 12 GPIO_ACTIVE_HIGH> - , <&gpio1 9 GPIO_ACTIVE_HIGH> - , <&gpio0 8 GPIO_ACTIVE_HIGH> - , <&gpio0 13 GPIO_ACTIVE_HIGH> - , <&gpio0 15 GPIO_ACTIVE_HIGH> - , <&gpio0 20 GPIO_ACTIVE_HIGH> - ; + col-gpios + = <&gpio0 12 GPIO_ACTIVE_HIGH> + , <&gpio1 9 GPIO_ACTIVE_HIGH> + , <&gpio0 8 GPIO_ACTIVE_HIGH> + , <&gpio0 13 GPIO_ACTIVE_HIGH> + , <&gpio0 15 GPIO_ACTIVE_HIGH> + , <&gpio0 20 GPIO_ACTIVE_HIGH> + ; }; diff --git a/app/boards/arm/dao/dao_right.dts b/app/boards/arm/dao/dao_right.dts index 786c62b8..cde4d5a9 100644 --- a/app/boards/arm/dao/dao_right.dts +++ b/app/boards/arm/dao/dao_right.dts @@ -7,20 +7,20 @@ #include "dao.dtsi" &default_transform { - col-offset = <6>; + col-offset = <6>; }; &extra_keys_transform { - col-offset = <6>; + col-offset = <6>; }; &kscan0 { - col-gpios - = <&gpio0 12 GPIO_ACTIVE_HIGH> - , <&gpio1 9 GPIO_ACTIVE_HIGH> - , <&gpio0 8 GPIO_ACTIVE_HIGH> - , <&gpio0 13 GPIO_ACTIVE_HIGH> - , <&gpio0 15 GPIO_ACTIVE_HIGH> - , <&gpio0 20 GPIO_ACTIVE_HIGH> - ; + col-gpios + = <&gpio0 12 GPIO_ACTIVE_HIGH> + , <&gpio1 9 GPIO_ACTIVE_HIGH> + , <&gpio0 8 GPIO_ACTIVE_HIGH> + , <&gpio0 13 GPIO_ACTIVE_HIGH> + , <&gpio0 15 GPIO_ACTIVE_HIGH> + , <&gpio0 20 GPIO_ACTIVE_HIGH> + ; }; From 16ad8e7749fa77d73107b6d363859d8e2a867223 Mon Sep 17 00:00:00 2001 From: Dmitry Kupriyanov Date: Mon, 19 Jun 2023 09:37:04 +0400 Subject: [PATCH 15/15] Fixed deprecated underscore notation. --- app/boards/arm/dao/dao.keymap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/boards/arm/dao/dao.keymap b/app/boards/arm/dao/dao.keymap index 6046dd3f..540e8bcd 100644 --- a/app/boards/arm/dao/dao.keymap +++ b/app/boards/arm/dao/dao.keymap @@ -14,11 +14,11 @@ #define ADJ 3 < { - quick_tap_ms = <220>; + quick-tap-ms = <220>; }; &mt { - quick_tap_ms = <220>; + quick-tap-ms = <220>; }; / {