diff --git a/app/boards/moergo/glove80/glove80.dtsi b/app/boards/moergo/glove80/glove80.dtsi index cf3ce7cc..05daf820 100644 --- a/app/boards/moergo/glove80/glove80.dtsi +++ b/app/boards/moergo/glove80/glove80.dtsi @@ -26,15 +26,15 @@ matrix_transform0: keymap_transform_0 { compatible = "zmk,matrix-transform"; - columns = <14>; - rows = <6>; + columns = <16>; + rows = <7>; map = < - RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13) - RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13) - RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13) - RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12) RC(3,13) - RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(0,6) RC(1,6) RC(2,6) RC(2,7) RC(1,7) RC(0,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11) RC(4,12) RC(4,13) - RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(3,6) RC(4,6) RC(5,6) RC(5,7) RC(4,7) RC(3,7) RC(5,9) RC(5,10) RC(5,11) RC(5,12) RC(5,13) + RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(6,7) RC(6,15) RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) + RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14) + RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13) RC(2,14) + RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,9) RC(3,10) RC(3,11) RC(3,12) RC(3,13) RC(3,14) + RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(0,6) RC(1,6) RC(2,6) RC(2,8) RC(1,8) RC(0,8) RC(4,9) RC(4,10) RC(4,11) RC(4,12) RC(4,13) RC(4,14) + RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(3,6) RC(4,6) RC(5,6) RC(5,8) RC(4,8) RC(3,8) RC(5,10) RC(5,11) RC(5,12) RC(5,13) RC(5,14) >; }; diff --git a/app/boards/moergo/glove80/glove80.keymap b/app/boards/moergo/glove80/glove80.keymap index 60129bd9..cc053615 100644 --- a/app/boards/moergo/glove80/glove80.keymap +++ b/app/boards/moergo/glove80/glove80.keymap @@ -67,7 +67,7 @@ default_layer { // --------------------------------------------------------------------------------------------------------------------------------- - // | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | + // | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | // | = | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - | // | TAB | Q | W | E | R | T | | Y | U | I | O | P | \ | // | ESC | A | S | D | F | G | | H | J | K | L | ; | ' | @@ -75,7 +75,7 @@ // | MAGIC | HOME| END | LEFT | RIGHT| | BSPC | DEL | LALT | | RALT | RET | SPACE | | UP | DOWN | [ | ] | PGDN | bindings = < - &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 + &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSLH &kp ESC &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT diff --git a/app/boards/moergo/glove80/glove80_lh.dts b/app/boards/moergo/glove80/glove80_lh.dts index 2ed56688..e180685c 100644 --- a/app/boards/moergo/glove80/glove80_lh.dts +++ b/app/boards/moergo/glove80/glove80_lh.dts @@ -99,6 +99,7 @@ , <&gpio0 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // LH ROW4 , <&gpio0 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // LH ROW5 , <&gpio1 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // LH ROW6 + , <&gpio0 22 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // LH ROW7 (EXT1) ; col-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH> // LH COL6 @@ -108,5 +109,6 @@ , <&gpio1 5 GPIO_ACTIVE_HIGH> // LH COL2 , <&gpio1 3 GPIO_ACTIVE_HIGH> // LH COL1 , <&gpio1 1 GPIO_ACTIVE_HIGH> // LH Thumb + , <&gpio0 24 GPIO_ACTIVE_HIGH> // LH COL7 (EXT3) ; }; diff --git a/app/boards/moergo/glove80/glove80_rh.dts b/app/boards/moergo/glove80/glove80_rh.dts index 7b54f62c..e9a12cc8 100644 --- a/app/boards/moergo/glove80/glove80_rh.dts +++ b/app/boards/moergo/glove80/glove80_rh.dts @@ -93,9 +93,9 @@ pinctrl-names = "default", "sleep"; }; -/* For right hand, the columns are offset by 7 */ +/* For right hand, the columns are offset by 8 */ &matrix_transform0 { - col-offset = <7>; + col-offset = <8>; }; &kscan0 { @@ -106,6 +106,7 @@ , <&gpio1 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // RH ROW4 , <&gpio0 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // RH ROW5 , <&gpio0 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // RH ROW6 + , <&gpio0 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // RH ROW7 (EXT1) ; col-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH> // RH Thumb @@ -115,5 +116,6 @@ , <&gpio1 5 GPIO_ACTIVE_HIGH> // RH COL4 , <&gpio1 3 GPIO_ACTIVE_HIGH> // RH COL5 , <&gpio1 1 GPIO_ACTIVE_HIGH> // RH COL6 + , <&gpio0 20 GPIO_ACTIVE_HIGH> // RH COL7 (EXT3) ; };