From 5becbf2931df874e780ce006431410a7239df73c Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 29 Jul 2023 11:34:41 +0200 Subject: [PATCH] fix keymap gpios and transform --- config/boards/shields/ownkb/ownkb.dtsi | 14 +++++----- config/boards/shields/ownkb/ownkb.keymap | 4 +-- .../boards/shields/ownkb/ownkb_left.overlay | 20 +++++++------ .../boards/shields/ownkb/ownkb_right.overlay | 28 +++++++++++-------- 4 files changed, 37 insertions(+), 29 deletions(-) diff --git a/config/boards/shields/ownkb/ownkb.dtsi b/config/boards/shields/ownkb/ownkb.dtsi index e0ee5ab..9289870 100644 --- a/config/boards/shields/ownkb/ownkb.dtsi +++ b/config/boards/shields/ownkb/ownkb.dtsi @@ -13,15 +13,15 @@ default_transform: keymap_transform_0 { compatible = "zmk,matrix-transform"; - columns = <5>; - rows = <10>; + rows = <5>; + columns = <16>; map = < - RC(1,0) RC(2,0) RC(3,0) RC(4,0) RC(5,0) RC(6,0) RC(7,0) RC(8,0) RC(9,0) RC(10,0) - RC(0,1) RC(1,1) RC(2,1) RC(3,1) RC(4,1) RC(5,1) RC(6,1) RC(7,1) RC(8,1) RC(9,1) RC(10,1) RC(11,1) -RC(0,0) RC(0,2) RC(1,2) RC(2,2) RC(3,2) RC(4,2) RC(5,2) RC(6,2) RC(7,2) RC(8,2) RC(9,2) RC(10,2) RC(11,2) RC(11,0) - RC(0,3) RC(1,3) RC(2,3) RC(3,3) RC(4,3) RC(5,3) RC(5,4) RC(6,4) RC(6,3) RC(7,3) RC(8,3) RC(9,3) RC(10,3) RC(11,3) - RC(1,4) RC(2,4) RC(3,4) RC(4,4) RC(7,4) RC(8,4) RC(9,4) RC(10,4) + RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) + RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) +RC(0,0) RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(0,11) + RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) + RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,7) RC(4,8) RC(4,9) RC(4,10) >; }; diff --git a/config/boards/shields/ownkb/ownkb.keymap b/config/boards/shields/ownkb/ownkb.keymap index 1181b03..8f4f273 100644 --- a/config/boards/shields/ownkb/ownkb.keymap +++ b/config/boards/shields/ownkb/ownkb.keymap @@ -25,8 +25,8 @@ bindings = < // | ESC | CTRL | A | S | D | F | G | | H | J | K | L | ; | ' | F13 | &kp ESC &kp LCTRL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT &kp RC(RA(F13)) // _____________________________________________________________________________________________________________________________________________ -// | SHIFT | Z | X | C | V | B | MUTE | PAUSE | N | M | < | > | / | SHIFT | - &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp C_MUTE &kp C_PAUSE &kp N &kp M &kp LT &kp GT &kp SLASH &kp RSHFT +// | SHIFT | Z | X | C | V | B | MUTE | PAUSE | N | M | , | . | / | SHIFT | + &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp C_MUTE &kp C_PAUSE &kp N &kp M &kp COMMA &kp DOT &kp SLASH &kp RSHFT // _________________________________________________________________________________ // | WIN | ALT | X/FSC | SPACE | ENTER | x/BSPC | ALT | WIN | &kp LGUI &kp LALT < 0 ESC &kp SPACE &kp ENTER < 0 BSPC &kp RALT &kp RGUI diff --git a/config/boards/shields/ownkb/ownkb_left.overlay b/config/boards/shields/ownkb/ownkb_left.overlay index e1d0be7..bf4aa0f 100644 --- a/config/boards/shields/ownkb/ownkb_left.overlay +++ b/config/boards/shields/ownkb/ownkb_left.overlay @@ -6,8 +6,19 @@ #include "ownkb.dtsi" &kscan0 { - diode-direction = "row2col"; + diode-direction = "col2row"; + + // top to bottom row-gpios + = <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // COL 0 (NUM) + , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // COL 1 (UPPER) + , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // COL 2 (HOME) + , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // COL 3 (LOWER) + , <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // COL 4 (THUMB + ROT) + ; + + // left to right + col-gpios = <&pro_micro 19 GPIO_ACTIVE_HIGH> // ROW 0 (outer) , <&pro_micro 18 GPIO_ACTIVE_HIGH> // ROW 1 (pinky) , <&pro_micro 15 GPIO_ACTIVE_HIGH> // ROW 2 (ring) @@ -15,13 +26,6 @@ , <&pro_micro 16 GPIO_ACTIVE_HIGH> // ROW 4 (index) , <&pro_micro 10 GPIO_ACTIVE_HIGH> // ROW 5 (inner) ; - col-gpios - = <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // COL 0 (NUM) - , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // COL 1 (UPPER) - , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // COL 2 (HOME) - , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // COL 3 (LOWER) - , <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // COL 4 (THUMB + ROT) - ; }; &left_encoder { diff --git a/config/boards/shields/ownkb/ownkb_right.overlay b/config/boards/shields/ownkb/ownkb_right.overlay index 3d8923d..4ad6385 100644 --- a/config/boards/shields/ownkb/ownkb_right.overlay +++ b/config/boards/shields/ownkb/ownkb_right.overlay @@ -10,21 +10,25 @@ }; &kscan0 { - diode-direction = "row2col"; + diode-direction = "col2row"; + + // top to bottom row-gpios - = <&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 9 (GPIO_ACTIVE_HIGH)> + = <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // COL 0 (NUM) + , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // COL 1 (UPPER) + , <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // COL 2 (HOME) + , <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // COL 3 (LOWER) + , <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // COL 4 (THUMB + ROT) ; + + // left to right col-gpios - = <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + = <&pro_micro 9 GPIO_ACTIVE_HIGH> // ROW 0 (outer) + , <&pro_micro 8 GPIO_ACTIVE_HIGH> // ROW 1 (pinky) + , <&pro_micro 7 GPIO_ACTIVE_HIGH> // ROW 2 (ring) + , <&pro_micro 6 GPIO_ACTIVE_HIGH> // ROW 3 (middle) + , <&pro_micro 5 GPIO_ACTIVE_HIGH> // ROW 4 (index) + , <&pro_micro 4 GPIO_ACTIVE_HIGH> // ROW 5 (inner) ; };