kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

running pre-commit to clean up files

Browse source
This commit is contained in:
OGRE 2023-08-14 22:29:41 -04:00
parent 6437efcd25
commit 0b70d9fc63
7 changed files with 82 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/boards/shields/ergos1_oe/Kconfig.defconfig
View file

@ -3,16 +3,16 @@
if SHIELD_ERGOS1_OE_LEFT if SHIELD_ERGOS1_OE_LEFT
config ZMK_KEYBOARD_NAME config ZMK_KEYBOARD_NAME
default "Ergo S-1" default "Ergo S-1"
config ZMK_SPLIT_ROLE_CENTRAL config ZMK_SPLIT_ROLE_CENTRAL
default y default y
endif endif
if SHIELD_ERGOS1_OE_LEFT || SHIELD_ERGOS1_OE_RIGHT if SHIELD_ERGOS1_OE_LEFT || SHIELD_ERGOS1_OE_RIGHT
config ZMK_SPLIT config ZMK_SPLIT
default y default y
endif endif

4
app/boards/shields/ergos1_oe/Kconfig.shield
View file

@ -1,7 +1,7 @@
# Copyright (c) 2021 The ZMK Contributors # Copyright (c) 2021 The ZMK Contributors
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
config SHIELD_ERGOS1_OE_LEFT 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 config SHIELD_ERGOS1_OE_RIGHT
def_bool $(shields_list_contains,ergos1_oe_right) def_bool $(shields_list_contains,ergos1_oe_right)

42
app/boards/shields/ergos1_oe/boards/nice_nano.overlay
View file

@ -7,32 +7,32 @@
#include <dt-bindings/led/led.h> #include <dt-bindings/led/led.h>
&spi1 { &spi1 {
compatible = "nordic,nrf-spim"; compatible = "nordic,nrf-spim";
status = "okay"; status = "okay";
mosi-pin = <6>; mosi-pin = <6>;
// Unused pins, needed for SPI definition, but not used by the ws2812 driver itself. // Unused pins, needed for SPI definition, but not used by the ws2812 driver itself.
sck-pin = <5>; sck-pin = <5>;
miso-pin = <7>; miso-pin = <7>;
led_strip: ws2812@0 { led_strip: ws2812@0 {
compatible = "worldsemi,ws2812-spi"; compatible = "worldsemi,ws2812-spi";
label = "WS2812"; label = "WS2812";
/* SPI */ /* SPI */
reg = <0>; /* ignored, but necessary for SPI bindings */ reg = <0>; /* ignored, but necessary for SPI bindings */
spi-max-frequency = <4000000>; spi-max-frequency = <4000000>;
/* WS2812 */ /* WS2812 */
chain-length = <5>; /* number of LEDs */ chain-length = <5>; /* number of LEDs */
spi-one-frame = <0x70>; spi-one-frame = <0x70>;
spi-zero-frame = <0x40>; spi-zero-frame = <0x40>;
color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>; color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
}; };
}; };
/ { / {
chosen { chosen {
zmk,underglow = &led_strip; zmk,underglow = &led_strip;
}; };
}; };

64
app/boards/shields/ergos1_oe/ergos1_oe.dtsi
View file

@ -3,48 +3,48 @@
* *
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
*/ */
#include <dt-bindings/zmk/matrix_transform.h> #include <dt-bindings/zmk/matrix_transform.h>
/ { / {
chosen { chosen {
zmk,kscan = &kscan0; zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform; zmk,matrix_transform = &default_transform;
}; };
default_transform: keymap_transform_0 { default_transform: keymap_transform_0 {
compatible = "zmk,matrix-transform"; compatible = "zmk,matrix-transform";
columns = <16>; columns = <16>;
rows = <6>; rows = <6>;
// | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | // | 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 | // | 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 | // | 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 | // | 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 | // | SW29 | SW30 | SW31 | SW32 | SW33 | SW34 | SW35 | | SW35 | SW34 | SW33 | SW32 | SW31 | SW30 | SW29 |
map = < 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(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(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(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(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(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) RC(5,7) RC(5,8)
>; >;
}; };
kscan0: kscan { kscan0: kscan {
compatible = "zmk,kscan-gpio-matrix"; compatible = "zmk,kscan-gpio-matrix";
label = "KSCAN"; label = "KSCAN";
diode-direction = "col2row"; diode-direction = "col2row";
row-gpios row-gpios
= <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
, <&pro_micro 20 (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 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
, <&pro_micro 18 (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 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
, <&pro_micro 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&pro_micro 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
; ;
}; };
}; };

6
app/boards/shields/ergos1_oe/ergos1_oe.keymap
View file

@ -16,7 +16,7 @@
/ { / {
keymap { keymap {
compatible = "zmk,keymap"; compatible = "zmk,keymap";
default_layer { default_layer {
// --------------------------------------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------------------------------------
// | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BSPC | // | 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 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 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 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 { 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 &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 &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 &kp INS &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp DOT &kp ENTER
&trans &trans &trans &trans
>; >;
}; };

20
app/boards/shields/ergos1_oe/ergos1_oe_left.overlay
View file

@ -7,14 +7,14 @@
#include "ergos1_oe.dtsi" #include "ergos1_oe.dtsi"
&kscan0 { &kscan0 {
col-gpios col-gpios
= <&pro_micro 14 GPIO_ACTIVE_HIGH> = <&pro_micro 14 GPIO_ACTIVE_HIGH>
, <&pro_micro 16 GPIO_ACTIVE_HIGH> , <&pro_micro 16 GPIO_ACTIVE_HIGH>
, <&pro_micro 8 GPIO_ACTIVE_HIGH> , <&pro_micro 8 GPIO_ACTIVE_HIGH>
, <&pro_micro 7 GPIO_ACTIVE_HIGH> , <&pro_micro 7 GPIO_ACTIVE_HIGH>
, <&pro_micro 6 GPIO_ACTIVE_HIGH> , <&pro_micro 6 GPIO_ACTIVE_HIGH>
, <&pro_micro 5 GPIO_ACTIVE_HIGH> , <&pro_micro 5 GPIO_ACTIVE_HIGH>
, <&pro_micro 4 GPIO_ACTIVE_HIGH> , <&pro_micro 4 GPIO_ACTIVE_HIGH>
, <&pro_micro 3 GPIO_ACTIVE_HIGH> , <&pro_micro 3 GPIO_ACTIVE_HIGH>
; ;
}; };

22
app/boards/shields/ergos1_oe/ergos1_oe_right.overlay
View file

@ -7,18 +7,18 @@
#include "ergos1_oe.dtsi" #include "ergos1_oe.dtsi"
&default_transform { &default_transform {
col-offset = <8>; col-offset = <8>;
}; };
&kscan0 { &kscan0 {
col-gpios col-gpios
= <&pro_micro 3 GPIO_ACTIVE_HIGH> = <&pro_micro 3 GPIO_ACTIVE_HIGH>
, <&pro_micro 4 GPIO_ACTIVE_HIGH> , <&pro_micro 4 GPIO_ACTIVE_HIGH>
, <&pro_micro 5 GPIO_ACTIVE_HIGH> , <&pro_micro 5 GPIO_ACTIVE_HIGH>
, <&pro_micro 6 GPIO_ACTIVE_HIGH> , <&pro_micro 6 GPIO_ACTIVE_HIGH>
, <&pro_micro 7 GPIO_ACTIVE_HIGH> , <&pro_micro 7 GPIO_ACTIVE_HIGH>
, <&pro_micro 8 GPIO_ACTIVE_HIGH> , <&pro_micro 8 GPIO_ACTIVE_HIGH>
, <&pro_micro 16 GPIO_ACTIVE_HIGH> , <&pro_micro 16 GPIO_ACTIVE_HIGH>
, <&pro_micro 14 GPIO_ACTIVE_HIGH> , <&pro_micro 14 GPIO_ACTIVE_HIGH>
; ;
}; };