diff --git a/.gitignore b/.gitignore index cffe381..cb6d45d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,4 @@ fp-info-cache *.lck # zmk firmware binaries -# *.uf2 +*.uf2 diff --git a/zmk-config/config/boards/shields/ownkb/ownkb.dtsi b/zmk-config/config/boards/shields/ownkb/ownkb.dtsi index 6a02f7f..9487dc9 100644 --- a/zmk-config/config/boards/shields/ownkb/ownkb.dtsi +++ b/zmk-config/config/boards/shields/ownkb/ownkb.dtsi @@ -33,15 +33,6 @@ 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) kscan0: kscan { compatible = "zmk,kscan-gpio-matrix"; label = "KSCAN"; - - diode-direction = "col2row"; - row-gpios - = <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - ; }; left_encoder: encoder_left { diff --git a/zmk-config/config/boards/shields/ownkb/ownkb_left.overlay b/zmk-config/config/boards/shields/ownkb/ownkb_left.overlay index 8467647..9befd32 100644 --- a/zmk-config/config/boards/shields/ownkb/ownkb_left.overlay +++ b/zmk-config/config/boards/shields/ownkb/ownkb_left.overlay @@ -6,13 +6,21 @@ #include "ownkb.dtsi" &kscan0 { + diode-direction = "row2col"; + row-gpios + = <&pro_micro 4 (GPIO_ACTIVE_LOW)> + , <&pro_micro 5 (GPIO_ACTIVE_LOW)> + , <&pro_micro 6 (GPIO_ACTIVE_LOW)> + , <&pro_micro 7 (GPIO_ACTIVE_LOW)> + , <&pro_micro 8 (GPIO_ACTIVE_LOW)> + , <&pro_micro 9 (GPIO_ACTIVE_LOW)> + ; col-gpios - = <&pro_micro 19 GPIO_ACTIVE_HIGH> - , <&pro_micro 18 GPIO_ACTIVE_HIGH> - , <&pro_micro 15 GPIO_ACTIVE_HIGH> - , <&pro_micro 14 GPIO_ACTIVE_HIGH> - , <&pro_micro 16 GPIO_ACTIVE_HIGH> - , <&pro_micro 10 GPIO_ACTIVE_HIGH> + = <&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> ; }; diff --git a/zmk-config/config/boards/shields/ownkb/ownkb_right.overlay b/zmk-config/config/boards/shields/ownkb/ownkb_right.overlay index fe3e357..cba9a1b 100644 --- a/zmk-config/config/boards/shields/ownkb/ownkb_right.overlay +++ b/zmk-config/config/boards/shields/ownkb/ownkb_right.overlay @@ -10,13 +10,21 @@ }; &kscan0 { + diode-direction = "row2col"; + row-gpios + = <&pro_micro 19 (GPIO_ACTIVE_LOW)> + , <&pro_micro 18 (GPIO_ACTIVE_LOW)> + , <&pro_micro 15 (GPIO_ACTIVE_LOW)> + , <&pro_micro 14 (GPIO_ACTIVE_LOW)> + , <&pro_micro 16 (GPIO_ACTIVE_LOW)> + , <&pro_micro 10 (GPIO_ACTIVE_LOW)> + ; col-gpios - = <&pro_micro 10 GPIO_ACTIVE_HIGH> - , <&pro_micro 16 GPIO_ACTIVE_HIGH> - , <&pro_micro 14 GPIO_ACTIVE_HIGH> - , <&pro_micro 15 GPIO_ACTIVE_HIGH> - , <&pro_micro 18 GPIO_ACTIVE_HIGH> - , <&pro_micro 19 GPIO_ACTIVE_HIGH> + = <&pro_micro 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> ; };