From c80fc1f87cfb322d473ef568ca9dd2c8a8f45107 Mon Sep 17 00:00:00 2001 From: KemoNine Date: Sat, 30 Jan 2021 00:53:55 +0000 Subject: [PATCH] feat(m60): add on/off button and tie to bootloader and reset via hold-tap --- app/boards/shields/m60/m60.conf | 1 + app/boards/shields/m60/m60.keymap | 23 +++++++++++---- app/boards/shields/m60/m60.overlay | 46 +++++++++++++++++++++++------- 3 files changed, 55 insertions(+), 15 deletions(-) diff --git a/app/boards/shields/m60/m60.conf b/app/boards/shields/m60/m60.conf index e69de29b..3323236b 100644 --- a/app/boards/shields/m60/m60.conf +++ b/app/boards/shields/m60/m60.conf @@ -0,0 +1 @@ +CONFIG_ZMK_KSCAN_COMPOSITE_DRIVER=y \ No newline at end of file diff --git a/app/boards/shields/m60/m60.keymap b/app/boards/shields/m60/m60.keymap index 7a19a29e..59e45da6 100644 --- a/app/boards/shields/m60/m60.keymap +++ b/app/boards/shields/m60/m60.keymap @@ -9,6 +9,17 @@ #include / { + behaviors { + bootreset: hold_tap { + compatible = "zmk,behavior-hold-tap"; + label = "BOOT_RESET"; + #binding-cells = <2>; + tapping_term_ms = <1000>; + flavor = "tap-preferred"; + bindings = <&bootloader>, <&reset>; + }; + }; + keymap0: keymap { compatible = "zmk,keymap"; @@ -21,16 +32,18 @@ // | CTL | WIN | ALT | SPACE | ALT | MO(1) | WIN | CTRL | // ------------------------------------------------------------------------------------------ bindings = < - &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS &kp EQUAL &kp BSPC - &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT &kp RBKT &kp BSLH - &kp CLCK &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT &kp RET - &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT - &kp LCTRL &kp LGUI &kp LALT &kp SPACE &kp RALT &mo 1 &kp RGUI &kp RCTRL +&bootreset +&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS &kp EQUAL &kp BSPC +&kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT &kp RBKT &kp BSLH +&kp CLCK &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT &kp RET +&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT +&kp LCTRL &kp LGUI &kp LALT &kp SPACE &kp RALT &mo 1 &kp RGUI &kp RCTRL >; }; fn_layer { bindings = < +&bootreset &kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &bootloader &trans &bt BT_CLR &none &none &none &none &none &none &none &none &none &none &none &reset &trans &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &kp LEFT &kp DOWN &kp UP &kp RIGHT &none &none &trans diff --git a/app/boards/shields/m60/m60.overlay b/app/boards/shields/m60/m60.overlay index 18d06511..ccc82e5c 100644 --- a/app/boards/shields/m60/m60.overlay +++ b/app/boards/shields/m60/m60.overlay @@ -12,9 +12,34 @@ zmk,matrix_transform = &default_transform; }; - kscan0: kscan { + kscan0: kscan0 { + compatible = "zmk,kscan-composite"; + label = "KSCAN_COMP"; + rows = <9>; + columns = <8>; + + direct: direct { + kscan = <&kscan_direct>; + }; + + matrix: matrix { + kscan = <&kscan_matrix>; + row-offset = <1>; + }; + }; + + kscan_direct: kscan1 { + compatible = "zmk,kscan-gpio-direct"; + label = "KSCAN_DIRECT"; + + input-gpios + = <&gpio0 27 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)> + ; + }; + + kscan_matrix: kscan2 { compatible = "zmk,kscan-gpio-matrix"; - label = "KSCAN"; + label = "KSCAN_MATRIX"; diode-direction = "col2row"; row-gpios @@ -42,19 +67,20 @@ default_transform: keymap_transform_0 { compatible = "zmk,matrix-transform"; columns = <8>; - rows = <8>; + rows = <9>; // | MX1 | MX2 | MX3 | MX4 | MX5 | MX6 | MX7 | MX8 | MX9 | MX10 | MX11 | MX12 | MX13 | MX14 | // | MX15 | MX16 | MX17 | MX18 | MX19 | MX20 | MX21 | MX22 | MX23 | MX24 | MX25 | MX26 | MX27 | MX28 | // | MX29 | MX30 | MX31 | MX32 | MX33 | MX34 | MX35 | MX36 | MX37 | MX38 | MX39 | MX40 | MX41 | // | MX42 | MX43 | MX44 | MX45 | MX46 | MX47 | MX48 | MX49 | MX50 | MX51 | MX52 | MX53 | // | MX54 | MX55 | MX56 | MX57 | MX58 | MX59 | MX60 | MX61 | - 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(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) -RC(3,3) RC(3,2) RC(3,1) RC(3,0) RC(2,7) RC(2,6) RC(2,5) RC(2,4) RC(2,3) RC(2,2) RC(2,1) RC(2,0) RC(1,7) RC(1,6) -RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(5,0) -RC(6,4) RC(6,3) RC(6,2) RC(6,1) RC(6,0) RC(5,7) RC(5,6) RC(5,5) RC(5,4) RC(5,3) RC(5,2) RC(5,1) -RC(6,5) RC(6,6) RC(6,7) RC(7,0) RC(7,1) RC(7,2) RC(7,3) RC(7,4) - >; + map = < +RC(0,0) +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(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) +RC(4,3) RC(4,2) RC(4,1) RC(4,0) RC(3,7) RC(3,6) RC(3,5) RC(3,4) RC(3,3) RC(3,2) RC(3,1) RC(3,0) RC(2,7) RC(2,6) +RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5) RC(5,6) RC(5,7) RC(6,0) +RC(7,4) RC(7,3) RC(7,2) RC(7,1) RC(7,0) RC(6,7) RC(6,6) RC(6,5) RC(6,4) RC(6,3) RC(6,2) RC(6,1) +RC(7,5) RC(7,6) RC(7,7) RC(8,0) RC(8,1) RC(8,2) RC(8,3) RC(8,4) + >; }; };