diff --git a/app/boards/shields/atreus62/Kconfig.defconfig b/app/boards/shields/atreus62/Kconfig.defconfig index 09eee2a5..82a1de60 100644 --- a/app/boards/shields/atreus62/Kconfig.defconfig +++ b/app/boards/shields/atreus62/Kconfig.defconfig @@ -3,4 +3,10 @@ if SHIELD_ATREUS62 config ZMK_KEYBOARD_NAME default "Atreus62" +config ZMK_BLE + default y + +config ZMK_USB + default y + endif \ No newline at end of file diff --git a/app/boards/shields/atreus62/atreus62.conf b/app/boards/shields/atreus62/atreus62.conf index e69de29b..15f65fb1 100644 --- a/app/boards/shields/atreus62/atreus62.conf +++ b/app/boards/shields/atreus62/atreus62.conf @@ -0,0 +1,3 @@ +# Uncomment lines below to enable encoder +# CONFIG_EC11=y +# CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y \ No newline at end of file diff --git a/app/boards/shields/atreus62/atreus62.keymap b/app/boards/shields/atreus62/atreus62.keymap index 7ac7aa86..fb911c29 100644 --- a/app/boards/shields/atreus62/atreus62.keymap +++ b/app/boards/shields/atreus62/atreus62.keymap @@ -20,19 +20,17 @@ // | TAB | Q | W | E | R | T |-------|-------| Y | U | I | O | P | \ | // | BSPC | A | S | D | F | G |-------|-------| H | J | K | L | ; | ' | // | SHIFT | Z | X | C | V | B |-------|-------| N | M | , | . | / | ENTER | - // | CTRL | Fn | LALT | LGUI | RAIS | | SPACE | ENTER | LOWR | | | - | = |-------| - - + // | CTRL | Fn | LALT | LGUI | RAIS | TAB | SPACE | ENTER | LOWR | | | - | = |-------| bindings = < - &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &trans - &kp GRAVE &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSLH - &kp BSPC &kp A &kp S &kp D &kp F &kp G &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 N &kp M &kp COMMA &kp DOT &kp FSLH &kp RET - &kp LCTRL &mo 4 &kp LALT &kp LGUI &mo 2 &kp TAB &kp SPACE &kp ENTER &mo 1 &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans + &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &trans + &kp GRAVE &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSLH + &kp BSPC &kp A &kp S &kp D &kp F &kp G &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 N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHIFT + &kp LCTRL &mo 5 &kp LALT &kp LGUI &mo 1 &kp TAB &kp SPACE &kp RET &mo 2 &trans &trans &kp MINUS &kp EQUAL &mo 4 >; }; - lower { + raise { // ---------------------------------------------------------------------------------------------------------- // | ESC | F2 | F3 | F4 | F5 | F6 |-------|-------| F7 | F8 | F9 | F10 | F11 | F12 | // | ~ | ! | @ | # | $ | % |-------|-------| ^ | & | * | ( | ) | DEL | @@ -40,15 +38,15 @@ // | | F7 | F8 | F9 | F10 | F11 |-------|-------| F12 | LS(#) |LS(|) | | | | // |-------| | | | | | | | | NEXT | Vol- | Vol+ | PLAY |-------| bindings = < - &kp ESC &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 - &kp TILDE &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp ASTRK &kp LPAR &kp RPAR &kp DEL - &trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE - &trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp LS(NON_US_HASH) &kp LS(NON_US_BSLH) &trans &trans &trans - &trans &trans &trans &trans &trans &trans &trans &trans &mo 3 &kp C_NEXT &kp C_VOL_DN &kp C_VOL_UP &kp C_PLAY_PAUSE &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &kp DEL &trans &trans &trans &trans &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans >; }; - raise { + lower { // ---------------------------------------------------------------------------------------------------------- // | ESC | F2 | F3 | F4 | F5 | F6 |-------|-------| F7 | F8 | F9 | F10 | F11 | F12 | // | ~ | 1 | 2 | 3 | 4 | 5 |-------|-------| 6 | 7 | 8 | 9 | 0 | DEL | @@ -56,15 +54,15 @@ // | | F7 | F8 | F9 | F10 | F11 |-------|-------| F12 | # | | | | | | // |-------| | | | | | | | | | | | |-------| bindings = < - &kp ESC &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 - &kp TILDE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp DEL - &kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH - &trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp NON_US_HASH &kp NON_US_BSLH &trans &trans &trans - &trans &trans &trans &trans &trans &mo 3 &trans &trans &trans &trans &trans &trans &trans &trans + &trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 + &trans &trans &trans &kp LBRC &kp RBRC &trans &trans &trans &trans &trans &trans &kp F12 + &trans &trans &trans &kp LPAR &kp RPAR &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans + &trans &trans &trans &kp LBKT &kp RBKT &trans &kp C_PREV &kp C_NEXT &trans &trans &trans &trans + &trans &trans &trans &trans &mo 3 &trans &trans &trans &trans &trans &trans &kp C_VOL_DN &kp C_VOL_UP &kp C_PP >; }; - adjust { + control { // ---------------------------------------------------------------------------------------------------------- // |tog(4)| F2 | F3 | F4 | F5 | F6 |------|------| F7 | F8 | F9 | F10 | F11 | F12 | // | | NA | NA | NA | NA | NA |------|------| NA | NA | NA | NA | NA |LALT(PRTSN)| @@ -80,6 +78,17 @@ >; }; + SOME_THING { + bindings = < + &bootloader &reset &trans &trans &trans &trans &kp N6 &kp N8 &kp N9 &trans &trans &trans + &trans &trans &trans &trans &trans &trans &kp N4 &kp N5 &kp N6 &trans &trans &trans + &trans &trans &trans &trans &trans &trans &kp N1 &kp N2 &kp N3 &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &kp N0 &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + + >; + }; +/* flock { // ---------------------------------------------------------------------------------------------------------- // |tog(4) | F2 | F3 | F4 | F5 | F6 |-------|-------| F7 | F8 | F9 | F10 | F11 | | @@ -94,6 +103,6 @@ &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans >; - }; + };*/ }; }; \ No newline at end of file diff --git a/app/boards/shields/atreus62/atreus62.overlay b/app/boards/shields/atreus62/atreus62.overlay index a3a954bf..35a7c271 100644 --- a/app/boards/shields/atreus62/atreus62.overlay +++ b/app/boards/shields/atreus62/atreus62.overlay @@ -4,6 +4,7 @@ * SPDX-License-Identifier: MIT */ + #include / { @@ -12,46 +13,49 @@ zmk,matrix_transform = &default_transform; }; - + /* + Thumb buttons (3,6) and (4,6) sit vertically in the matric, and mapped to the bottom for easier keymapping. + */ default_transform: keymap_transform_0 { - compatible = "zmk-matrix-transform" + compatible = "zmk,matrix-transform"; columns = <13>; rows = <5>; map = < RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) - RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12) - RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(3,6) RC(4,6) RC(4,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11) RC(4,12) + RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12) + RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(3,6) RC(4,6) RC(4,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11) RC(4,12) >; }; kscan0: kscan_0 { compatible = "zmk,kscan-gpio-matrix"; label = "KSCAN"; - diode-direction = "col2row"; + diode-direction = "row2col"; col-gpios - = <&pro_micro 21 GPIO_ACTIVE_HIGH> // col 0 - , <&pro_micro 20 GPIO_ACTIVE_HIGH> // col 1 - , <&pro_micro 19 GPIO_ACTIVE_HIGH> // col 2 - , <&pro_micro 18 GPIO_ACTIVE_HIGH> // col 3 - , <&pro_micro 15 GPIO_ACTIVE_HIGH> // col 4 - , <&pro_micro 14 GPIO_ACTIVE_HIGH> // col 5 - , <&pro_micro 16 GPIO_ACTIVE_HIGH> // col 6 - , <&pro_micro 6 GPIO_ACTIVE_HIGH> // col 7 - , <&pro_micro 7 GPIO_ACTIVE_HIGH> // col 8 - , <&pro_micro 8 GPIO_ACTIVE_HIGH> // col 9 - , <&pro_micro 9 GPIO_ACTIVE_HIGH> // col 10 - , <&pro_micro 1 GPIO_ACTIVE_HIGH> // col 11 + = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // col 0 + , <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // col 1 + , <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // col 2 + , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // col 3 + , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // col 4 + , <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // col 5 + , <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // col 6 + , <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // col 7 + , <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // col 8 + , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // col 9 + , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // col 10 + , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // col 11 + , <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // col 12 ; row-gpios - = <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 0 - , <&pro_micro 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 1 - , <&pro_micro 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 2 - , <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 3 - , <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 4 + = <&pro_micro 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 0 + , <&pro_micro 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 1 + , <&pro_micro 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 2 + , <&pro_micro 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 3 + , <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 4 ; }; }; \ No newline at end of file diff --git a/app/boards/shields/atreus62/atreus62.yml b/app/boards/shields/atreus62/atreus62.yml index 3500ceb3..e378e4e7 100644 --- a/app/boards/shields/atreus62/atreus62.yml +++ b/app/boards/shields/atreus62/atreus62.yml @@ -3,6 +3,6 @@ id: atreus62 name: Atreus62 type: shield url: https://github.com/profet23/atreus62 -requires: [nice!nano] +requires: [nice_nano] features: - keys