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_proton_handwire/keymap/keymap.overlay | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'app/boards/shields/petejohanson_proton_handwire') diff --git a/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay b/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay index c1bd542..f4d746e 100644 --- a/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay +++ b/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay @@ -21,6 +21,9 @@ KC_A MT(MOD_LSFT, KC_B) CC_RAIS CC_LOWR >; + bindings = < + &reset &kp 0 + &kp 1 &kp 2>; }; lower: layer_1 { @@ -29,6 +32,9 @@ KC_MPLY KC_MNXT ZC_TRNS ZC_TRNS >; + bindings = < + &reset &kp 0 + &kp 1 &kp 2>; }; raise: layer_2 { @@ -37,6 +43,9 @@ KC_C KC_D ZC_TRNS ZC_TRNS >; + bindings = < + &reset &kp 0 + &kp 1 &kp 2>; }; }; }; -- 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_proton_handwire/keymap/keymap.overlay | 1 + 1 file changed, 1 insertion(+) (limited to 'app/boards/shields/petejohanson_proton_handwire') diff --git a/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay b/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay index f4d746e..ad07e9f 100644 --- a/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay +++ b/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay @@ -1,3 +1,4 @@ +#include #include #include -- cgit v1.2.3 From ec663310c1682f55578b1b6d886ebcae4965425c Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Sun, 21 Jun 2020 22:46:27 -0400 Subject: Clean up after refactor, better HID constants. --- .../keymap/keymap.overlay | 28 +++++++--------------- 1 file changed, 9 insertions(+), 19 deletions(-) (limited to 'app/boards/shields/petejohanson_proton_handwire') diff --git a/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay b/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay index ad07e9f..7540022 100644 --- a/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay +++ b/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay @@ -17,36 +17,26 @@ default: layer_0 { label = "DEFAULT"; - keys = - < - KC_A MT(MOD_LSFT, KC_B) - CC_RAIS CC_LOWR - >; + bindings = < - &reset &kp 0 - &kp 1 &kp 2>; + &reset &kp A + &kp B &kp C>; }; lower: layer_1 { label = "LOWER"; - keys = < - KC_MPLY KC_MNXT - ZC_TRNS ZC_TRNS - >; + bindings = < - &reset &kp 0 - &kp 1 &kp 2>; + &reset &kp D + &kp F &kp E>; }; raise: layer_2 { label = "RAISE"; - keys = < - KC_C KC_D - ZC_TRNS ZC_TRNS - >; + bindings = < - &reset &kp 0 - &kp 1 &kp 2>; + &reset &kp I + &kp G &kp H>; }; }; }; -- cgit v1.2.3 From 037db585c1c317d9de5743c3ac67ce0c914232e7 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Sun, 21 Jun 2020 22:52:50 -0400 Subject: Remove unneeded custom keymap code. --- .../keymap/include/keymap.h | 9 ------ .../petejohanson_proton_handwire/keymap/keymap.c | 34 ---------------------- .../keymap/keymap.overlay | 12 ++++---- 3 files changed, 6 insertions(+), 49 deletions(-) delete mode 100644 app/boards/shields/petejohanson_proton_handwire/keymap/include/keymap.h delete mode 100644 app/boards/shields/petejohanson_proton_handwire/keymap/keymap.c (limited to 'app/boards/shields/petejohanson_proton_handwire') diff --git a/app/boards/shields/petejohanson_proton_handwire/keymap/include/keymap.h b/app/boards/shields/petejohanson_proton_handwire/keymap/include/keymap.h deleted file mode 100644 index 0fd2f9f..0000000 --- a/app/boards/shields/petejohanson_proton_handwire/keymap/include/keymap.h +++ /dev/null @@ -1,9 +0,0 @@ - -#include - -#define DEFAULT 0 -#define RAISE 1 -#define LOWER 2 - -#define CC_RAIS ZC_CSTM(RAISE) -#define CC_LOWR ZC_CSTM(LOWER) diff --git a/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.c b/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.c deleted file mode 100644 index bde15ac..0000000 --- a/app/boards/shields/petejohanson_proton_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(LOWER); - } - else - { - zmk_keymap_layer_deactivate(LOWER); - } - - return false; - case CC_RAIS: - if (key_event->pressed) - { - zmk_keymap_layer_activate(RAISE); - } - else - { - zmk_keymap_layer_deactivate(RAISE); - } - return false; - } - - return true; -}; diff --git a/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay b/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay index 7540022..406b014 100644 --- a/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay +++ b/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay @@ -19,24 +19,24 @@ label = "DEFAULT"; bindings = < - &reset &kp A - &kp B &kp C>; + &to 1 &kp A + &to 2 &kp C>; }; lower: layer_1 { label = "LOWER"; bindings = < - &reset &kp D - &kp F &kp E>; + &trans &kp D + &trans &kp E>; }; raise: layer_2 { label = "RAISE"; bindings = < - &reset &kp I - &kp G &kp H>; + &trans &kp I + &trans &kp H>; }; }; }; -- cgit v1.2.3 From 321d510d02500e1c1eac0817a846e9469cc27342 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Sun, 21 Jun 2020 22:56:13 -0400 Subject: One more minor fix. --- app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay | 1 - 1 file changed, 1 deletion(-) (limited to 'app/boards/shields/petejohanson_proton_handwire') diff --git a/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay b/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay index 406b014..911ff4a 100644 --- a/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay +++ b/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay @@ -1,6 +1,5 @@ #include #include -#include / { chosen { -- cgit v1.2.3 From 8027be106eef7671604695a1a0f0e2828839ceb3 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Sun, 21 Jun 2020 23:20:38 -0400 Subject: Fix momentary-layer reference. --- app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/boards/shields/petejohanson_proton_handwire') diff --git a/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay b/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay index 911ff4a..ca03557 100644 --- a/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay +++ b/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay @@ -18,8 +18,8 @@ label = "DEFAULT"; bindings = < - &to 1 &kp A - &to 2 &kp C>; + &mo 1 &kp A + &mo 2 &kp C>; }; lower: layer_1 { -- cgit v1.2.3