From 94f986898242565ffbc8644aaee1f54e5541590a Mon Sep 17 00:00:00 2001 From: Dmitry Kupriyanov Date: Fri, 12 May 2023 13:25:10 +0300 Subject: [PATCH] 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> + ; };