From c23d752917774bc740c791e2f7eeef6f8f9e1033 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Fri, 19 Jun 2020 15:32:33 -0400 Subject: Some initial work on behavior bindings for keymaps --- .../shields/petejohanson_handwire/keymap/keymap.overlay | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'app/boards/shields/petejohanson_handwire') diff --git a/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay b/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay index d87363f..8cb7654 100644 --- a/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay +++ b/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay @@ -1,4 +1,6 @@ #include +#include +#include #include / { @@ -21,6 +23,9 @@ KC_A MT(MOD_LSFT, KC_B) ZC_NO ZC_NO CC_RAIS CC_LOWR ZC_NO ZC_NO >; + bindings = < + &reset &kp 0 + &kp 1 &kp 2>; }; lower: layer_1 { @@ -29,6 +34,10 @@ KC_MPLY KC_MNXT ZC_NO ZC_NO ZC_TRNS ZC_TRNS ZC_NO ZC_NO >; + + bindings = < + &reset &kp 0 + &kp 1 &kp 2>; }; raise: layer_2 { @@ -36,6 +45,10 @@ keys = < KC_C KC_D ZC_NO ZC_NO ZC_TRNS ZC_TRNS ZC_NO ZC_NO>; + + bindings = < + &reset &kp 0 + &kp 1 &kp 2>; }; }; }; -- cgit v1.2.3 From d65629b9a0b79b6e294419fe9a4118fb09491c91 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Sat, 20 Jun 2020 00:11:39 -0400 Subject: Lots more pieces toward HID working again. --- app/boards/shields/petejohanson_handwire/keymap/keymap.overlay | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'app/boards/shields/petejohanson_handwire') diff --git a/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay b/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay index 8cb7654..5ae78cf 100644 --- a/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay +++ b/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay @@ -1,11 +1,18 @@ #include #include #include +#include #include / { chosen { zmk,keymap = &keymap0; + zmk,global_bindings = &bindings; + }; + + bindings: global_bindings { + compatible = "zmk,global-bindings"; + bindings = <&reset>; }; keymap0: keymap { compatible = "zmk,keymap"; -- cgit v1.2.3 From 223edf05ad08938b066f9187668ebfae43c5e91a Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Sun, 21 Jun 2020 21:43:44 -0400 Subject: Refactor global bindings, implement mod-tap. * Use extra comptible = "zmk,behavior-global" to add behaviors to global bindings for event notification. * Implement mod-tap, as a keymap binding and global one to skip tap if other keycode pressed while held. --- app/boards/shields/petejohanson_handwire/keymap/keymap.overlay | 5 ----- 1 file changed, 5 deletions(-) (limited to 'app/boards/shields/petejohanson_handwire') diff --git a/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay b/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay index 5ae78cf..1a70ff4 100644 --- a/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay +++ b/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay @@ -7,13 +7,8 @@ / { chosen { zmk,keymap = &keymap0; - zmk,global_bindings = &bindings; }; - bindings: global_bindings { - compatible = "zmk,global-bindings"; - bindings = <&reset>; - }; keymap0: keymap { compatible = "zmk,keymap"; label ="Default keymap"; -- cgit v1.2.3 From c6625169e5f6cfc8641fc08662f59935abf11588 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Sun, 21 Jun 2020 22:05:11 -0400 Subject: Refactor to single include. --- app/boards/shields/petejohanson_handwire/keymap/keymap.overlay | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'app/boards/shields/petejohanson_handwire') diff --git a/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay b/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay index 1a70ff4..5da88b8 100644 --- a/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay +++ b/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay @@ -1,7 +1,5 @@ #include -#include -#include -#include +#include #include / { -- cgit v1.2.3 From 55cf9db564e66e2804f2d3f2201c55c3c86a90d7 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Mon, 22 Jun 2020 11:06:01 -0400 Subject: Fix consumer keys w/ refactored behaviors. --- .../petejohanson_handwire/keymap/include/keymap.h | 5 ---- .../shields/petejohanson_handwire/keymap/keymap.c | 34 ---------------------- .../petejohanson_handwire/keymap/keymap.overlay | 26 ++++------------- 3 files changed, 6 insertions(+), 59 deletions(-) delete mode 100644 app/boards/shields/petejohanson_handwire/keymap/include/keymap.h delete mode 100644 app/boards/shields/petejohanson_handwire/keymap/keymap.c (limited to 'app/boards/shields/petejohanson_handwire') diff --git a/app/boards/shields/petejohanson_handwire/keymap/include/keymap.h b/app/boards/shields/petejohanson_handwire/keymap/include/keymap.h deleted file mode 100644 index 01cd9e5..0000000 --- a/app/boards/shields/petejohanson_handwire/keymap/include/keymap.h +++ /dev/null @@ -1,5 +0,0 @@ - -#include - -#define CC_RAIS ZC_CSTM(1) -#define CC_LOWR ZC_CSTM(2) \ No newline at end of file diff --git a/app/boards/shields/petejohanson_handwire/keymap/keymap.c b/app/boards/shields/petejohanson_handwire/keymap/keymap.c deleted file mode 100644 index 067cd08..0000000 --- a/app/boards/shields/petejohanson_handwire/keymap/keymap.c +++ /dev/null @@ -1,34 +0,0 @@ - -#include -#include -#include - -bool zmk_handle_key_user(struct zmk_key_event *key_event) -{ - switch (key_event->key) - { - case CC_LOWR: - if (key_event->pressed) - { - zmk_keymap_layer_activate(1); - } - else - { - zmk_keymap_layer_deactivate(1); - } - - return false; - case CC_RAIS: - if (key_event->pressed) - { - zmk_keymap_layer_activate(2); - } - else - { - zmk_keymap_layer_deactivate(2); - } - return false; - } - - return true; -}; diff --git a/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay b/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay index 5da88b8..b294171 100644 --- a/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay +++ b/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay @@ -1,6 +1,5 @@ #include #include -#include / { chosen { @@ -18,37 +17,24 @@ default: layer_0 { label = "DEFAULT"; - keys = - < - KC_A MT(MOD_LSFT, KC_B) ZC_NO ZC_NO - CC_RAIS CC_LOWR ZC_NO ZC_NO - >; bindings = < - &reset &kp 0 - &kp 1 &kp 2>; + &cp M_NEXT &mt MOD_LSFT B &trans &trans + &mo 1 &mo 2 &trans &trans>; }; lower: layer_1 { label = "LOWER"; - keys = < - KC_MPLY KC_MNXT ZC_NO ZC_NO - ZC_TRNS ZC_TRNS ZC_NO ZC_NO - >; bindings = < - &reset &kp 0 - &kp 1 &kp 2>; + &cp M_PLAY &cp M_NEXT &trans &trans + &trans &trans &trans &trans>; }; raise: layer_2 { label = "RAISE"; - keys = < - KC_C KC_D ZC_NO ZC_NO - ZC_TRNS ZC_TRNS ZC_NO ZC_NO>; - bindings = < - &reset &kp 0 - &kp 1 &kp 2>; + &kp C &kp D &trans &trans + &trans &kp E &trans &trans>; }; }; }; -- cgit v1.2.3