From 511e8d1a09898a5db377f68209140eb9f9c81509 Mon Sep 17 00:00:00 2001 From: mike fettis Date: Thu, 22 Jun 2023 16:26:00 -0500 Subject: [PATCH] hazel is the greatest --- config/boards/shields/ffkb/ffkb.keymap | 8 --- config/boards/shields/ffkb/ffkb.overlay | 79 +++++++------------------ 2 files changed, 23 insertions(+), 64 deletions(-) diff --git a/config/boards/shields/ffkb/ffkb.keymap b/config/boards/shields/ffkb/ffkb.keymap index 456c1d0..130b2ed 100644 --- a/config/boards/shields/ffkb/ffkb.keymap +++ b/config/boards/shields/ffkb/ffkb.keymap @@ -53,10 +53,6 @@ / { - sensors { - compatible = "zmk,keymap-sensors"; - sensors = <&encoder_1 &encoder_2>; - }; behaviors { hm: layer_mods { @@ -99,7 +95,6 @@ default_layer { label = "Default"; - sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN &inc_dec_kp LC(RIGHT) LC(LEFT) &inc_dec_kp LC(RIGHT) LC(LEFT) >; bindings = < &gresc &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp MINUS @@ -112,7 +107,6 @@ raise_layer { label = "Raise"; - sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN &inc_dec_kp LG(EQUAL) LG(MINUS) &inc_dec_kp LG(EQUAL) LG(MINUS)>; bindings = < &kp GRAVE &gresc &none &none &kp LBKT &kp LBRC &kp RBRC &kp RBKT &none &none &none &none @@ -124,7 +118,6 @@ lower_layer { label = "Lower "; - sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN &inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN &inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>; bindings = < &kp TILDE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp EQUAL @@ -136,7 +129,6 @@ util_layer { label = "Util"; - sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN &inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN &inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>; bindings = < &kp GRAVE &kp EXCL &kp AT &kp HASH &kp DOLLAR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp EQUAL diff --git a/config/boards/shields/ffkb/ffkb.overlay b/config/boards/shields/ffkb/ffkb.overlay index 85d11ca..8aefc55 100644 --- a/config/boards/shields/ffkb/ffkb.overlay +++ b/config/boards/shields/ffkb/ffkb.overlay @@ -12,31 +12,6 @@ zmk,matrix_transform = &default_transform; }; - // Left encoder - encoder_1: encoder_1 { - compatible = "alps,ec11"; - label = "Encoder 1"; - a-gpios = <&pro_micro 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - b-gpios = <&pro_micro 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - resolution = <4>; - status = "okay"; - }; - - // Right encoder - encoder_2: encoder_2 { - compatible = "alps,ec11"; - label = "Encoder 2"; - a-gpios = <&pro_micro 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - b-gpios = <&pro_micro 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - resolution = <4>; - status = "okay"; - }; - - sensors { - compatible = "zmk,keymap-sensors"; - sensors = <&encoder_1 &encoder_2>; - }; - kscan0: kscan_0 { compatible = "zmk,kscan-gpio-matrix"; label = "KSCAN"; @@ -46,48 +21,40 @@ debounce-release-ms = <5>; col-gpios - = <&pro_micro 8 GPIO_ACTIVE_HIGH> // col 1 - , <&pro_micro 9 GPIO_ACTIVE_HIGH> // col 0 - , <&pro_micro 7 GPIO_ACTIVE_HIGH> // col 2 - , <&pro_micro 5 GPIO_ACTIVE_HIGH> // col 4 - , <&pro_micro 6 GPIO_ACTIVE_HIGH> // col 3 - , <&pro_micro 4 GPIO_ACTIVE_HIGH> // col 5 - , <&pro_micro 16 GPIO_ACTIVE_HIGH> // col 6 - , <&pro_micro 14 GPIO_ACTIVE_HIGH> // col 7 + = <&pro_micro 8 (GPIO_ACTIVE_HIGH)> + , <&pro_micro 7 (GPIO_ACTIVE_HIGH)> + , <&pro_micro 6 (GPIO_ACTIVE_HIGH)> + , <&pro_micro 5 (GPIO_ACTIVE_HIGH)> + , <&pro_micro 4 (GPIO_ACTIVE_HIGH)> + , <&pro_micro 9 (GPIO_ACTIVE_HIGH)> + , <&pro_micro 21 (GPIO_ACTIVE_HIGH)> + , <&pro_micro 20 (GPIO_ACTIVE_HIGH)> + , <&pro_micro 19 (GPIO_ACTIVE_HIGH)> + , <&pro_micro 18 (GPIO_ACTIVE_HIGH)> + , <&pro_micro 15 (GPIO_ACTIVE_HIGH)> + , <&pro_micro 14 (GPIO_ACTIVE_HIGH)> ; - //col-gpios - // = <&shift_reg 1 (GPIO_ACTIVE_HIGH)> - // , <&shift_reg 0 (GPIO_ACTIVE_HIGH)> - // , <&shift_reg 2 (GPIO_ACTIVE_HIGH)> - // , <&shift_reg 4 (GPIO_ACTIVE_HIGH)> - // , <&shift_reg 3 (GPIO_ACTIVE_HIGH)> - // , <&shift_reg 5 (GPIO_ACTIVE_HIGH)> - // , <&shift_reg 6 (GPIO_ACTIVE_HIGH)> - // , <&shift_reg 7 (GPIO_ACTIVE_HIGH)> - // ; row-gpios - = <&pro_micro 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 0 - , <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 1 - , <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 2 - , <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 3 - , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 4 - , <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 5 + = <&pro_micro 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 0 + , <&pro_micro 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 1 + , <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 2 + , <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // row 3 ; }; default_transform: keymap_transform_0 { compatible = "zmk,matrix-transform"; - columns = <8>; - rows = <6>; + columns = <12>; + rows = <4>; map = < - RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(4,3) RC(3,4) RC(4,5) RC(3,7) - 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(3,2) RC(4,4) RC(3,5) RC(4,7) - 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(4,2) RC(3,3) RC(3,6) RC(4,6) - RC(5,1) RC(5,3) RC(5,4) RC(5,5) RC(5,6) RC(5,7) RC(5,2) RC(5,0) + RC(0,0) 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(0,11) + 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(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(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) + >; }; }; -