From 81d9c51744acdbc52566087be9417427b9295e6a Mon Sep 17 00:00:00 2001 From: Jamie Ding Date: Sun, 20 Mar 2022 01:13:46 +0000 Subject: [PATCH] wip --- app/boards/shields/mercury/mercury.keymap | 47 ++++++++++++------- app/tests/mercury/sdDn_dUp/events.patterns | 6 +-- .../mercury/sdDn_dUp/keycode_events.snapshot | 9 ++-- .../mercury/sdDn_dUp/native_posix.keymap | 11 +++-- 4 files changed, 44 insertions(+), 29 deletions(-) diff --git a/app/boards/shields/mercury/mercury.keymap b/app/boards/shields/mercury/mercury.keymap index 33151a5c..b2ef1993 100644 --- a/app/boards/shields/mercury/mercury.keymap +++ b/app/boards/shields/mercury/mercury.keymap @@ -11,8 +11,9 @@ #define MED 5 #define SYS 6 #define DKL 7 -#define EKL 8 -#define KKL 9 +#define SFL 8 +//#define EKL 9 +//#define KKL 10 // 25 At least while acclimating, 25 is too short and will miss attempts // 50 words like "layer", the rolled "er" turn into combos @@ -24,10 +25,12 @@ label = "MACRO_S"; compatible = "zmk,behavior-macro"; #binding-cells = <0>; + wait-ms = <1>; bindings - = <¯o_press &kp LSFT &tog DKL> + // tog doesn't work, the tog on release doesn't seem to fire + = <¯o_press &mo SFL &kp LSFT> , <¯o_pause_for_release> - , <¯o_release &kp LSFT &tog DKL> + , <¯o_release &mo SFL &kp LSFT> ; }; @@ -35,10 +38,11 @@ label = "MACRO_F"; compatible = "zmk,behavior-macro"; #binding-cells = <0>; + wait-ms = <1>; bindings - = <¯o_press &mo NUM &tog DKL> + = <¯o_press &mo SFL &mo NUM> , <¯o_pause_for_release> - , <¯o_release &mo NUM &tog DKL> + , <¯o_release &mo SFL &mo NUM> ; }; }; @@ -60,7 +64,7 @@ #binding-cells = <2>; flavor = "tap-unless-interrupted"; tapping-term-ms = ; - bindings = <&mcs>, <&kp>; + bindings = <&mcf>, <&kp>; hold-trigger-key-positions = <14 15 16>; }; @@ -183,22 +187,31 @@ >; }; - e_key_layer { + sf_key_layer { bindings = < -&trans &trans &kp LSFT &none &mo FUN &trans /**/ &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans /**/ &trans &trans &trans &trans &trans &trans +&trans &trans &trans &mo DKL &trans &trans /**/ &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans /**/ &trans &trans &trans &trans &trans &trans &trans &trans &trans /**/ &trans &trans &trans >; }; - k_key_layer { - bindings = < -&trans &trans &trans &trans &trans &trans /**/ &trans &trans &trans &trans &trans &trans -&trans &trans &trans &trans &trans &trans /**/ &trans &trans &none &kp RSFT &trans &trans -&trans &trans &trans &trans &trans &trans /**/ &trans &trans &trans &trans &trans &trans - &trans &trans &trans /**/ &trans &trans &trans - >; - }; +// e_key_layer { +// bindings = < +//&trans &trans &kp LSFT &none &mo FUN &trans /**/ &trans &trans &trans &trans &trans &trans +//&trans &trans &trans &trans &trans &trans /**/ &trans &trans &trans &trans &trans &trans +//&trans &trans &trans &trans &trans &trans /**/ &trans &trans &trans &trans &trans &trans +// &trans &trans &trans /**/ &trans &trans &trans +// >; +// }; + +// k_key_layer { +// bindings = < +//&trans &trans &trans &trans &trans &trans /**/ &trans &trans &trans &trans &trans &trans +//&trans &trans &trans &trans &trans &trans /**/ &trans &trans &none &kp RSFT &trans &trans +//&trans &trans &trans &trans &trans &trans /**/ &trans &trans &trans &trans &trans &trans +// &trans &trans &trans /**/ &trans &trans &trans +// >; +// }; }; }; diff --git a/app/tests/mercury/sdDn_dUp/events.patterns b/app/tests/mercury/sdDn_dUp/events.patterns index 1516547f..46aba3c7 100644 --- a/app/tests/mercury/sdDn_dUp/events.patterns +++ b/app/tests/mercury/sdDn_dUp/events.patterns @@ -1,6 +1,6 @@ s/.*hid_listener_keycode/kp/p -// s/.*mo_keymap_binding/mo/p -// s/.*decide_hold_tap/ht_decide/p -// s/.*on_hold_tap_binding/ht_binding/p +s/.*mo_keymap_binding/mo/p +s/.*decide_hold_tap/ht_decide/p +s/.*on_hold_tap_binding/ht_binding/p // s/.*keymap_apply_position_state/pos_state/p // s/.*behavior_queue_process_next/queue_process_next/p diff --git a/app/tests/mercury/sdDn_dUp/keycode_events.snapshot b/app/tests/mercury/sdDn_dUp/keycode_events.snapshot index 3f2f6c4b..7f3df313 100644 --- a/app/tests/mercury/sdDn_dUp/keycode_events.snapshot +++ b/app/tests/mercury/sdDn_dUp/keycode_events.snapshot @@ -1,10 +1,11 @@ -pos_state: layer: 0, position: 14, binding name: S_MACRO_TAP, pressed: 1 ht_binding_pressed: 14 new undecided hold_tap ht_decide: 14 decided hold-interrupt (tap-unless-interrupted decision moment other-key-down) -pos_state: layer: 0, position: 15, binding name: D_LAYER_TAP, pressed: 1 ht_binding_pressed: 15 new undecided hold_tap -queue_process_next: Invoking MO: 0x08 0x00 mo_pressed: position 0 layer 8 -queue_process_next: Processing next queued behavior in 100ms ht_decide: 15 decided tap (tap-unless-interrupted decision moment other-key-down) kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00 +kp_released: usage_page 0x07 keycode 0x0d implicit_mods 0x00 explicit_mods 0x00 +kp_pressed: usage_page 0x07 keycode 0x0d implicit_mods 0x00 explicit_mods 0x00 +ht_binding_released: 14 cleaning up hold-tap +kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00 +ht_binding_released: 15 cleaning up hold-tap diff --git a/app/tests/mercury/sdDn_dUp/native_posix.keymap b/app/tests/mercury/sdDn_dUp/native_posix.keymap index ca4a8a59..3ddea0f8 100644 --- a/app/tests/mercury/sdDn_dUp/native_posix.keymap +++ b/app/tests/mercury/sdDn_dUp/native_posix.keymap @@ -8,10 +8,11 @@ //ZMK_MOCK_PRESS( 0,1,10) //ZMK_MOCK_RELEASE(0,1,10) - ZMK_MOCK_PRESS( 1,2,5) - ZMK_MOCK_PRESS( 1,3,5) - ZMK_MOCK_PRESS( 1,7,5) - //ZMK_MOCK_RELEASE(1,2,5) - //ZMK_MOCK_RELEASE(1,3,5) + ZMK_MOCK_PRESS( 1,2,10) + ZMK_MOCK_PRESS( 1,3,10) + ZMK_MOCK_PRESS( 1,7,10) + ZMK_MOCK_RELEASE(1,7,10) + ZMK_MOCK_RELEASE(1,2,10) + ZMK_MOCK_RELEASE(1,3,10) >; }; \ No newline at end of file