From 704b9b16546d3020d27f3c0a124dbbf56c76a3de Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 3 Jun 2022 09:59:50 -0700 Subject: [PATCH] Final --- app/boards/shields/ergos1_ose/ergos1_ose.dtsi | 10 +- .../shields/ergos1_ose/ergos1_ose.keymap | 106 +++++++----------- .../ergos1_ose/ergos1_ose_left.overlay | 6 +- .../ergos1_ose/ergos1_ose_right.overlay | 8 +- 4 files changed, 52 insertions(+), 78 deletions(-) diff --git a/app/boards/shields/ergos1_ose/ergos1_ose.dtsi b/app/boards/shields/ergos1_ose/ergos1_ose.dtsi index b7179127..f73a23a6 100644 --- a/app/boards/shields/ergos1_ose/ergos1_ose.dtsi +++ b/app/boards/shields/ergos1_ose/ergos1_ose.dtsi @@ -25,8 +25,8 @@ 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,12) RC(3,13) RC(3,14) RC(3,15) RC(3,16) RC(3,17) - RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(4,7) RC(4,8) RC(4,9) RC(4,13) RC(4,14) RC(4,15) RC(4,16) +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) >; }; @@ -37,12 +37,12 @@ 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, diode-direction = "col2row"; row-gpios - = <&gpio0 29 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + = <&gpio0 31 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 29 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&gpio0 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&gpio1 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&gpio1 13 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpio1 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpio0 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 17 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> ; }; diff --git a/app/boards/shields/ergos1_ose/ergos1_ose.keymap b/app/boards/shields/ergos1_ose/ergos1_ose.keymap index aed22c42..e6baa1c1 100644 --- a/app/boards/shields/ergos1_ose/ergos1_ose.keymap +++ b/app/boards/shields/ergos1_ose/ergos1_ose.keymap @@ -10,73 +10,47 @@ #include #include + #define DEFAULT 0 + #define FN 1 + / { - keymap { - compatible = "zmk,keymap" ; + keymap { + compatible = "zmk,keymap"; + + default_layer { +// --------------------------------------------------------------------------------------------------------------------------------- +// | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BSPC | +// | WIN | Q | W | E | R | T | | Y | U | I | O | P | EQL | +// | TAB | A | S | D | F | G | | H | J | K | L | SCLN | QUOT | +// | LCTL | Z | X | C | V | B | | CTL | ALT | | CAPS | CTL | | N | M | COMM | DOT | SLSH | MINS | +// | GRV | BSLS | LEFT | RGHT | | SHFT | FN | HOME | | PGUP | ENT | SPC | | UP | DN | LBKT | RBKT | +// | END | | PGDN | + bindings = < + &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC + &kp LGUI &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp EQUAL + &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 + >; + }; + fn_layer { +// --------------------------------------------------------------------------------------------------------------------------------- +// |BT_CLR| F1 | F2 | F3 | F4 | F5 | | | NLCK | = | / | * | | +// | | F6 | F7 | F8 | F9 | F10 | | | 7 | 8 | 9 | - | | +// | | | | | | | | | 4 | 5 | 6 | + | | +// | | | | | | PTSC | | | | | | | | | 1 | 2 | 3 | ENT | | +// | | INS | | | | | FN | | | | | | | | | . | ENT | +// | | | | + bindings = < + &bt BT_CLR &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &trans &kp KP_NUM&kp EQL &kp SLASH &kp STAR &trans + &trans &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &trans &kp N7 &kp N8 &kp N9 &kp MINUS &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 &kp INS &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp DOT &kp ENTER + &trans &trans + >; + }; - default_layer { -// -------------------------------------------------------------------------------------------------------------------------------- -// | ESC | 1 | 2 | 3 | 4 | 5 | --- | 6 | 7 | 8 | 9 | 0 | BKSP | -// | TAB | Q | W | E | R | T | ( | --- | ) | Y | U | I | O | P | - | -// | CTRL | A | S | D | F | G | [ | --- | ] | H | J | K | L | ; | ' | -// | SHIFT | Z | X | C | V | B | PG_UP | PG_DOWN | --- | HOME | END | N | M | , | . | / | SHFT(RET) | -// | CRTL | ALT | GUI | LOWER | GUI | LOWER | SPACE | --- | DEL | SPACE | RAISE | LEFT | DOWN | UP | RIGHT | - bindings = < - &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC - &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp LPAR &kp RPAR &kp Y &kp U &kp I &kp O &kp P &kp MINUS - &kp LCTRL &kp A &kp S &kp D &kp F &kp G &kp LBKT &kp RBKT &kp H &kp J &kp K &kp L &kp SEMI &kp SQT - &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp PG_UP &kp PG_DN &kp HOME &kp END &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mt RSHFT RET - &kp LCTRL &kp LALT &kp LGUI &mo 3 &kp LGUI &mo 1 &kp SPACE &kp DEL &kp SPACE &mo 2 &kp LEFT &kp DOWN &kp UP &kp RIGHT - >; - - }; - - lower_layer { -// -------------------------------------------------------------------------------------------------------------------------- -// | ESC | 1 | 2 | 3 | 4 | 5 | --- | 6 | 7 | 8 | 9 | 0 | DEL | -// | ESC | 1 | 2 | 3 | 4 | 5 | ( | --- | ) | 6 | 7 | 8 | 9 | 0 | DEL | -// | CTRL | - | = | [ | ] | \ | [ | --- | ] | * | 4 | 5 | 6 | + | - | -// | SHIFT | ESC | GUI | COPY | PASTE | | PG_UP | PG_DOWN | --- | HOME | END | \ | 1 | 2 | 3 | RET | RET | -// | CRTL | ALT | GUI | LOWER | GUI | LOWER | SPACE | --- | DEL | 0 | RAISE | LEFT | DOWN | UP | RIGHT | - bindings = < - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &trans &trans &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp DEL - &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &trans &trans &kp KP_MULTIPLY &kp N4 &kp N5 &kp N6 &kp KP_PLUS &kp KP_MINUS - &trans &kp ESC &kp LGUI &kp LG(C) &kp LG(V) &kp GRAVE &trans &trans &trans &trans &kp KP_DIVIDE &kp N1 &kp N2 &kp N3 &kp RET &kp RET - &trans &trans &trans &trans &trans &trans &trans &trans &kp N0 &mo 3 &trans &trans &trans &trans - >; - }; - - raise_layer { -// ---------------------------------------------------------------------------------------------------------------------------- -// | ESC | 1 | 2 | 3 | 4 | 5 | --- | 6 | 7 | 8 | 9 | 0 | DEL | -// | ESC | ! | @ | # | $ | % | ( | --- | ) | ^ | & | * | ( | ) | DEL | -// | CTRL | _ | + | { | } | "|" | [ | --- | ] | HOME | PGUP | PRSC | UP | ` | ~ | -// | SHIFT | ESC | GUI | ( | ) | | PG_UP | PG_DOWN | --- | HOME | END | END | PGDN | LEFT | DOWN | RIGHT | RET | -// | CRTL | ALT | GUI | LOWER | GUI | LOWER | SPACE | --- | DEL | SPACE | RAISE | LEFT | DOWN | UP | RIGHT | - bindings = < - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &kp ESC &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &trans &trans &kp CARET &kp AMPS &kp ASTRK &kp LPAR &kp RPAR &kp DEL - &trans &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE &trans &trans &kp HOME &kp PG_UP &kp PSCRN &kp UP &kp GRAVE &kp TILDE - &trans &kp ESC &kp LGUI &kp LPAR &kp RPAR &kp TILDE &trans &trans &trans &trans &kp END &kp PG_DN &kp LEFT &kp DOWN &kp RIGHT &kp RET - &trans &trans &trans &mo 3 &trans &mo 3 &trans &trans &trans &trans &trans &trans &trans &trans - >; - }; - - adjust_layer { -// ----------------------------------------------------------------------------------------- -// | F1 | F2 | F3 | F4 | F5 | F6 | --- | F7 | F8 | F9 | F10 | F11 | F12 | -// | TAB | | | | | | BOOTL | --- | ) | BT1 | BT2 | BT3 | BT4 | BT5 | OUTPUT TGL | -// | CTRL | MUTE | Vol Dn | Vol Up | Play/Pause | | RESET | --- | ] | F1 | F2 | F3 | F4 | F5 | F6 | -// | SHIFT | PSCRN | PSCRN | CAPS | | | PG_UP | PG_DOWN | --- | HOME | END | F7 | F8 | F9 | F10 | F11 | F12 | -// | CRTL | ALT | GUI | LOWER | GUI | LOWER | SPACE | --- | DEL | SPACE | RAISE | LEFT | DOWN | UP | RIGHT | - bindings = < - &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 - &trans &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 &out OUT_TOG - &trans &kp K_MUTE &kp C_VOL_DN &kp C_VOL_UP &kp C_PLAY_PAUSE &none &reset &trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 - &trans &kp PSCRN &kp PSCRN &kp CLCK &none &none &trans &trans &trans &trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - >; - }; }; }; diff --git a/app/boards/shields/ergos1_ose/ergos1_ose_left.overlay b/app/boards/shields/ergos1_ose/ergos1_ose_left.overlay index be182c0a..a3b793c0 100644 --- a/app/boards/shields/ergos1_ose/ergos1_ose_left.overlay +++ b/app/boards/shields/ergos1_ose/ergos1_ose_left.overlay @@ -8,13 +8,13 @@ &kscan0 { col-gpios - = <&gpio0 10 GPIO_ACTIVE_HIGH> - , <&gpio0 9 GPIO_ACTIVE_HIGH> - , <&gpio1 6 GPIO_ACTIVE_HIGH> + = <&gpio1 11 GPIO_ACTIVE_HIGH> + , <&gpio0 10 GPIO_ACTIVE_HIGH> , <&gpio1 4 GPIO_ACTIVE_HIGH> , <&gpio0 11 GPIO_ACTIVE_HIGH> , <&gpio1 0 GPIO_ACTIVE_HIGH> , <&gpio0 24 GPIO_ACTIVE_HIGH> , <&gpio0 22 GPIO_ACTIVE_HIGH> + , <&gpio0 20 GPIO_ACTIVE_HIGH> ; }; diff --git a/app/boards/shields/ergos1_ose/ergos1_ose_right.overlay b/app/boards/shields/ergos1_ose/ergos1_ose_right.overlay index babb76ff..f8b2f149 100644 --- a/app/boards/shields/ergos1_ose/ergos1_ose_right.overlay +++ b/app/boards/shields/ergos1_ose/ergos1_ose_right.overlay @@ -7,18 +7,18 @@ #include "ergos1_ose.dtsi" &default_transform { - col-offset = <9>; + col-offset = <8>; }; &kscan0 { col-gpios - = <&gpio0 22 GPIO_ACTIVE_HIGH> + = <&gpio0 20 GPIO_ACTIVE_HIGH> + , <&gpio0 22 GPIO_ACTIVE_HIGH> , <&gpio0 24 GPIO_ACTIVE_HIGH> , <&gpio1 0 GPIO_ACTIVE_HIGH> , <&gpio0 11 GPIO_ACTIVE_HIGH> , <&gpio1 4 GPIO_ACTIVE_HIGH> - , <&gpio1 6 GPIO_ACTIVE_HIGH> - , <&gpio0 9 GPIO_ACTIVE_HIGH> , <&gpio0 10 GPIO_ACTIVE_HIGH> + , <&gpio1 11 GPIO_ACTIVE_HIGH> ; };