From 0b70d9fc63d34cd0cc8edd63588f050af470efa8 Mon Sep 17 00:00:00 2001 From: OGRE Date: Mon, 14 Aug 2023 22:29:41 -0400 Subject: [PATCH] running pre-commit to clean up files --- .../shields/ergos1_oe/Kconfig.defconfig | 6 +- app/boards/shields/ergos1_oe/Kconfig.shield | 4 +- .../ergos1_oe/boards/nice_nano.overlay | 42 ++++++------ app/boards/shields/ergos1_oe/ergos1_oe.dtsi | 64 +++++++++---------- app/boards/shields/ergos1_oe/ergos1_oe.keymap | 6 +- .../shields/ergos1_oe/ergos1_oe_left.overlay | 20 +++--- .../shields/ergos1_oe/ergos1_oe_right.overlay | 22 +++---- 7 files changed, 82 insertions(+), 82 deletions(-) diff --git a/app/boards/shields/ergos1_oe/Kconfig.defconfig b/app/boards/shields/ergos1_oe/Kconfig.defconfig index 105b00c6..59c51e33 100644 --- a/app/boards/shields/ergos1_oe/Kconfig.defconfig +++ b/app/boards/shields/ergos1_oe/Kconfig.defconfig @@ -3,16 +3,16 @@ if SHIELD_ERGOS1_OE_LEFT config ZMK_KEYBOARD_NAME - default "Ergo S-1" + default "Ergo S-1" config ZMK_SPLIT_ROLE_CENTRAL - default y + default y endif if SHIELD_ERGOS1_OE_LEFT || SHIELD_ERGOS1_OE_RIGHT config ZMK_SPLIT - default y + default y endif \ No newline at end of file diff --git a/app/boards/shields/ergos1_oe/Kconfig.shield b/app/boards/shields/ergos1_oe/Kconfig.shield index bdb85705..e67dce26 100644 --- a/app/boards/shields/ergos1_oe/Kconfig.shield +++ b/app/boards/shields/ergos1_oe/Kconfig.shield @@ -1,7 +1,7 @@ # Copyright (c) 2021 The ZMK Contributors # SPDX-License-Identifier: MIT config SHIELD_ERGOS1_OE_LEFT - def_bool $(shields_list_contains,ergos1_oe_left) + def_bool $(shields_list_contains,ergos1_oe_left) config SHIELD_ERGOS1_OE_RIGHT - def_bool $(shields_list_contains,ergos1_oe_right) + def_bool $(shields_list_contains,ergos1_oe_right) diff --git a/app/boards/shields/ergos1_oe/boards/nice_nano.overlay b/app/boards/shields/ergos1_oe/boards/nice_nano.overlay index d67e46f9..6aa1e861 100644 --- a/app/boards/shields/ergos1_oe/boards/nice_nano.overlay +++ b/app/boards/shields/ergos1_oe/boards/nice_nano.overlay @@ -7,32 +7,32 @@ #include &spi1 { - compatible = "nordic,nrf-spim"; - status = "okay"; - mosi-pin = <6>; - // Unused pins, needed for SPI definition, but not used by the ws2812 driver itself. - sck-pin = <5>; - miso-pin = <7>; + compatible = "nordic,nrf-spim"; + status = "okay"; + mosi-pin = <6>; + // Unused pins, needed for SPI definition, but not used by the ws2812 driver itself. + sck-pin = <5>; + miso-pin = <7>; - led_strip: ws2812@0 { - compatible = "worldsemi,ws2812-spi"; - label = "WS2812"; + led_strip: ws2812@0 { + compatible = "worldsemi,ws2812-spi"; + label = "WS2812"; - /* SPI */ - reg = <0>; /* ignored, but necessary for SPI bindings */ - spi-max-frequency = <4000000>; + /* SPI */ + reg = <0>; /* ignored, but necessary for SPI bindings */ + spi-max-frequency = <4000000>; - /* WS2812 */ - chain-length = <5>; /* number of LEDs */ - spi-one-frame = <0x70>; - spi-zero-frame = <0x40>; + /* WS2812 */ + chain-length = <5>; /* number of LEDs */ + spi-one-frame = <0x70>; + spi-zero-frame = <0x40>; - color-mapping = ; - }; + color-mapping = ; + }; }; / { - chosen { - zmk,underglow = &led_strip; - }; + chosen { + zmk,underglow = &led_strip; + }; }; diff --git a/app/boards/shields/ergos1_oe/ergos1_oe.dtsi b/app/boards/shields/ergos1_oe/ergos1_oe.dtsi index e7d48292..2c9c618a 100644 --- a/app/boards/shields/ergos1_oe/ergos1_oe.dtsi +++ b/app/boards/shields/ergos1_oe/ergos1_oe.dtsi @@ -3,48 +3,48 @@ * * SPDX-License-Identifier: MIT */ - + #include / { - chosen { - zmk,kscan = &kscan0; - zmk,matrix_transform = &default_transform; - }; + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; - default_transform: keymap_transform_0 { - compatible = "zmk,matrix-transform"; - columns = <16>; - rows = <6>; + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <16>; + rows = <6>; // | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | // | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | SW13 | | SW13 | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | // | SW14 | SW15 | SW16 | SW17 | SW18 | SW19 | SW20 | | SW20 | SW19 | SW18 | SW17 | SW16 | SW15 | SW14 | // | SW21 | SW22 | SW23 | SW24 | SW25 | SW26 | SW27 | SW28 | | SW28 | SW27 | SW26 | SW25 | SW24 | SW23 | SW22 | SW21 | // | SW29 | SW30 | SW31 | SW32 | SW33 | SW34 | SW35 | | SW35 | SW34 | SW33 | SW32 | SW31 | SW30 | SW29 | - map = < -RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,15) -RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14) RC(1,15) -RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,10) RC(2,11) RC(2,12) RC(2,13) RC(2,14) RC(2,15) -RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12) RC(3,13) RC(3,14) RC(3,15) - RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11) RC(4,12) RC(4,13) RC(4,14) - RC(5,7) RC(5,8) - >; - }; + map = < +RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,15) +RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14) RC(1,15) +RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,10) RC(2,11) RC(2,12) RC(2,13) RC(2,14) RC(2,15) +RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12) RC(3,13) RC(3,14) RC(3,15) + RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11) RC(4,12) RC(4,13) RC(4,14) + RC(5,7) RC(5,8) + >; + }; - kscan0: kscan { - compatible = "zmk,kscan-gpio-matrix"; - label = "KSCAN"; + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; - diode-direction = "col2row"; - row-gpios - = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - ; - - }; + diode-direction = "col2row"; + row-gpios + = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + + }; }; diff --git a/app/boards/shields/ergos1_oe/ergos1_oe.keymap b/app/boards/shields/ergos1_oe/ergos1_oe.keymap index e6baa1c1..01511608 100644 --- a/app/boards/shields/ergos1_oe/ergos1_oe.keymap +++ b/app/boards/shields/ergos1_oe/ergos1_oe.keymap @@ -16,7 +16,7 @@ / { keymap { compatible = "zmk,keymap"; - + default_layer { // --------------------------------------------------------------------------------------------------------------------------------- // | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BSPC | @@ -31,7 +31,7 @@ &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT &kp DEL &kp Z &kp X &kp C &kp V &kp B &kp LCTRL &kp LALT &kp CAPS &kp RCTRL &kp N &kp M &kp COMMA &kp PERIOD &kp SLASH &kp MINUS &kp GRAVE &kp BSLH &kp LEFT &kp RIGHT &kp LSHFT &mo 1 &kp HOME &kp PG_UP &kp ENTER &kp SPACE &kp UP &kp DOWN &kp LBKT &kp RBKT - &kp END &kp PG_DN + &kp END &kp PG_DN >; }; fn_layer { @@ -48,7 +48,7 @@ &trans &trans &trans &trans &trans &trans &trans &kp N4 &kp N5 &kp N6 &kp PLUS &trans &trans &trans &trans &trans &kp PSCRN &trans &kp F11 &kp F12 &trans &trans &trans &kp N1 &kp N2 &kp N3 &kp ENTER &trans &trans &kp INS &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp DOT &kp ENTER - &trans &trans + &trans &trans >; }; diff --git a/app/boards/shields/ergos1_oe/ergos1_oe_left.overlay b/app/boards/shields/ergos1_oe/ergos1_oe_left.overlay index 2fe0f4b4..49def51c 100644 --- a/app/boards/shields/ergos1_oe/ergos1_oe_left.overlay +++ b/app/boards/shields/ergos1_oe/ergos1_oe_left.overlay @@ -7,14 +7,14 @@ #include "ergos1_oe.dtsi" &kscan0 { - col-gpios - = <&pro_micro 14 GPIO_ACTIVE_HIGH> - , <&pro_micro 16 GPIO_ACTIVE_HIGH> - , <&pro_micro 8 GPIO_ACTIVE_HIGH> - , <&pro_micro 7 GPIO_ACTIVE_HIGH> - , <&pro_micro 6 GPIO_ACTIVE_HIGH> - , <&pro_micro 5 GPIO_ACTIVE_HIGH> - , <&pro_micro 4 GPIO_ACTIVE_HIGH> - , <&pro_micro 3 GPIO_ACTIVE_HIGH> - ; + col-gpios + = <&pro_micro 14 GPIO_ACTIVE_HIGH> + , <&pro_micro 16 GPIO_ACTIVE_HIGH> + , <&pro_micro 8 GPIO_ACTIVE_HIGH> + , <&pro_micro 7 GPIO_ACTIVE_HIGH> + , <&pro_micro 6 GPIO_ACTIVE_HIGH> + , <&pro_micro 5 GPIO_ACTIVE_HIGH> + , <&pro_micro 4 GPIO_ACTIVE_HIGH> + , <&pro_micro 3 GPIO_ACTIVE_HIGH> + ; }; diff --git a/app/boards/shields/ergos1_oe/ergos1_oe_right.overlay b/app/boards/shields/ergos1_oe/ergos1_oe_right.overlay index 48f820f3..c3db30bc 100644 --- a/app/boards/shields/ergos1_oe/ergos1_oe_right.overlay +++ b/app/boards/shields/ergos1_oe/ergos1_oe_right.overlay @@ -7,18 +7,18 @@ #include "ergos1_oe.dtsi" &default_transform { - col-offset = <8>; + col-offset = <8>; }; &kscan0 { - col-gpios - = <&pro_micro 3 GPIO_ACTIVE_HIGH> - , <&pro_micro 4 GPIO_ACTIVE_HIGH> - , <&pro_micro 5 GPIO_ACTIVE_HIGH> - , <&pro_micro 6 GPIO_ACTIVE_HIGH> - , <&pro_micro 7 GPIO_ACTIVE_HIGH> - , <&pro_micro 8 GPIO_ACTIVE_HIGH> - , <&pro_micro 16 GPIO_ACTIVE_HIGH> - , <&pro_micro 14 GPIO_ACTIVE_HIGH> - ; + col-gpios + = <&pro_micro 3 GPIO_ACTIVE_HIGH> + , <&pro_micro 4 GPIO_ACTIVE_HIGH> + , <&pro_micro 5 GPIO_ACTIVE_HIGH> + , <&pro_micro 6 GPIO_ACTIVE_HIGH> + , <&pro_micro 7 GPIO_ACTIVE_HIGH> + , <&pro_micro 8 GPIO_ACTIVE_HIGH> + , <&pro_micro 16 GPIO_ACTIVE_HIGH> + , <&pro_micro 14 GPIO_ACTIVE_HIGH> + ; };