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 --- app/boards/arm/nice_nano/nice_nano.dts | 2 ++ .../shields/petejohanson_handwire/keymap/keymap.overlay | 13 +++++++++++++ .../petejohanson_proton_handwire/keymap/keymap.overlay | 9 +++++++++ 3 files changed, 24 insertions(+) (limited to 'app/boards') diff --git a/app/boards/arm/nice_nano/nice_nano.dts b/app/boards/arm/nice_nano/nice_nano.dts index 21b60d3..4604e9a 100644 --- a/app/boards/arm/nice_nano/nice_nano.dts +++ b/app/boards/arm/nice_nano/nice_nano.dts @@ -6,6 +6,8 @@ /dts-v1/; #include +#include +#include #include "arduino_pro_micro_pins.dtsi" / { 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>; }; }; }; 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 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/arm/nice_nano/nice_nano.dts | 1 + app/boards/native_posix.overlay | 22 ++++++++++++++++++++++ .../petejohanson_handwire/keymap/keymap.overlay | 7 +++++++ 3 files changed, 30 insertions(+) (limited to 'app/boards') diff --git a/app/boards/arm/nice_nano/nice_nano.dts b/app/boards/arm/nice_nano/nice_nano.dts index 4604e9a..9d3b484 100644 --- a/app/boards/arm/nice_nano/nice_nano.dts +++ b/app/boards/arm/nice_nano/nice_nano.dts @@ -8,6 +8,7 @@ #include #include #include +#include #include "arduino_pro_micro_pins.dtsi" / { diff --git a/app/boards/native_posix.overlay b/app/boards/native_posix.overlay index 9d92bee..3f2eead 100644 --- a/app/boards/native_posix.overlay +++ b/app/boards/native_posix.overlay @@ -1,10 +1,20 @@ #include +#include +#include +#include +#include #include / { chosen { zmk,kscan = &kscan0; zmk,keymap = &keymap0; + zmk,global_bindings = &bindings; + }; + + bindings: global_bindings { + compatible = "zmk,global-bindings"; + bindings = <&keymap_behavior &hid_behavior>; }; kscan0: kscan_0 { @@ -58,6 +68,10 @@ KC_A MT(MOD_LSFT, KC_B) KC_C KC_D KC_E KC_F KC_G KC_H >; + + bindings = < + &kp 5 &kp 0 &kp 10 &kp 11 + &kp 1 &kp 2 &kp 4 &kp 89>; }; lower: layer_1 { @@ -66,6 +80,10 @@ KC_A KC_B KC_C KC_D KC_E KC_F KC_G KC_H >; + + bindings = < + &kp 5 &kp 0 &kp 10 &kp 11 + &kp 1 &kp 2 &kp 4 &kp 89>; }; raise: layer_2 { @@ -74,6 +92,10 @@ KC_E KC_F KC_G KC_H KC_A KC_B KC_C KC_D >; + + bindings = < + &kp 5 &kp 0 &kp 10 &kp 11 + &kp 1 &kp 2 &kp 4 &kp 89>; }; }; }; 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 7e659851c80bf2819554d93ad9971f56aa5b225b Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Sat, 20 Jun 2020 17:54:52 -0400 Subject: Refactor matrix transform, positions pervasively * Do mapping to positions right in kscan handler, and then surface positions throughout the API. --- app/boards/shields/kyria/kyria.overlay | 39 ++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'app/boards') diff --git a/app/boards/shields/kyria/kyria.overlay b/app/boards/shields/kyria/kyria.overlay index af4e591..4140fcf 100644 --- a/app/boards/shields/kyria/kyria.overlay +++ b/app/boards/shields/kyria/kyria.overlay @@ -4,9 +4,20 @@ * SPDX-License-Identifier: MIT */ +#include +#include +#include + / { chosen { zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + zmk,global_bindings = &bindings; + }; + + bindings: global_bindings { + compatible = "zmk,global-bindings"; + bindings = <&keymap_behavior &hid_behavior>; }; kscan0: kscan_comp { @@ -28,6 +39,34 @@ }; }; + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; +// | MX6 | MX5 | MX4 | MX3 | MX2 | MX1 | | MX1 | MX2 | MX3 | MX4 | MX5 | MX6 | +// | MX12 | MX11 | MX10 | MX9 | MX8 | MX7 | | MX7 | MX8 | MX9 | MX10 | MX11 | MX12 | +// | MX20 | MX19 | MX18 | MX17 | MX16 | MX15 | MX14 | MX13 | | MX13 | MX14 | MX15 | MX16 | MX17 | MX18 | MX19 | MX20 | +// | MX25 | MX24 | MX23 | MX22 | MX21 | | MX21 | MX22 | MX23 | MX24 | MX25 | + map = < +RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,15) +RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14) RC(1,15) +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(2,12) RC(2,13) RC(2,14) RC(2,15) + RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12) + >; + }; + +// | MX5 | MX4 | MX3 | MX2 | MX1 | | MX1 | MX2 | MX3 | MX4 | MX5 | +// | MX11 | MX10 | MX9 | MX8 | MX7 | | MX7 | MX8 | MX9 | MX10 | MX11 | +// | MX19 | MX18 | MX17 | MX16 | MX15 | MX14 | MX13 | | MX13 | MX14 | MX15 | MX16 | MX17 | MX18 | MX19 | +// | MX25 | MX24 | MX23 | MX22 | MX21 | | MX21 | MX22 | MX23 | MX24 | MX25 | + five_column_transform: keymap_transform_1 { + compatible = "zmk,matrix-transform"; + map = < +RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13) +RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13) +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(2,12) RC(2,13) + RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) + >; + }; + kscan_left: kscan_left { compatible = "gpio-kscan"; label = "KSCAN_LEFT"; -- 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/native_posix.overlay | 9 ++------- app/boards/shields/kyria/kyria.overlay | 6 ------ app/boards/shields/petejohanson_handwire/keymap/keymap.overlay | 5 ----- 3 files changed, 2 insertions(+), 18 deletions(-) (limited to 'app/boards') diff --git a/app/boards/native_posix.overlay b/app/boards/native_posix.overlay index 3f2eead..8004705 100644 --- a/app/boards/native_posix.overlay +++ b/app/boards/native_posix.overlay @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -9,12 +10,6 @@ chosen { zmk,kscan = &kscan0; zmk,keymap = &keymap0; - zmk,global_bindings = &bindings; - }; - - bindings: global_bindings { - compatible = "zmk,global-bindings"; - bindings = <&keymap_behavior &hid_behavior>; }; kscan0: kscan_0 { @@ -70,7 +65,7 @@ >; bindings = < - &kp 5 &kp 0 &kp 10 &kp 11 + &kp 5 &mt MOD_LSFT KC_B &kp 10 &kp 11 &kp 1 &kp 2 &kp 4 &kp 89>; }; diff --git a/app/boards/shields/kyria/kyria.overlay b/app/boards/shields/kyria/kyria.overlay index 4140fcf..d560ed6 100644 --- a/app/boards/shields/kyria/kyria.overlay +++ b/app/boards/shields/kyria/kyria.overlay @@ -12,12 +12,6 @@ chosen { zmk,kscan = &kscan0; zmk,matrix_transform = &default_transform; - zmk,global_bindings = &bindings; - }; - - bindings: global_bindings { - compatible = "zmk,global-bindings"; - bindings = <&keymap_behavior &hid_behavior>; }; kscan0: kscan_comp { 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 93635077e600e269aa905a0558c07acf0efebffb Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Sun, 21 Jun 2020 21:56:49 -0400 Subject: Implement momentary layer + transparent behaviors * Implement "momentary layer" behavior with `&mo` reference. * Implement basic "transparent" behavior with `&trans` reference. --- app/boards/native_posix.overlay | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'app/boards') diff --git a/app/boards/native_posix.overlay b/app/boards/native_posix.overlay index 8004705..1a4fb13 100644 --- a/app/boards/native_posix.overlay +++ b/app/boards/native_posix.overlay @@ -1,6 +1,8 @@ #include #include +#include #include +#include #include #include #include @@ -65,7 +67,7 @@ >; bindings = < - &kp 5 &mt MOD_LSFT KC_B &kp 10 &kp 11 + &kp 5 &mo 1 &kp 10 &kp 11 &kp 1 &kp 2 &kp 4 &kp 89>; }; @@ -77,8 +79,8 @@ >; bindings = < - &kp 5 &kp 0 &kp 10 &kp 11 - &kp 1 &kp 2 &kp 4 &kp 89>; + &kp 20 &trans &kp 18 &kp 19 + &kp 21 &kp 22 &kp 24 &kp 49>; }; raise: layer_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/arm/nice_nano/nice_nano.dts | 3 --- app/boards/native_posix.overlay | 8 +----- .../shields/kyria/keymaps/default/keymap.overlay | 30 +--------------------- .../petejohanson_handwire/keymap/keymap.overlay | 4 +-- .../keymap/keymap.overlay | 1 + 5 files changed, 4 insertions(+), 42 deletions(-) (limited to 'app/boards') diff --git a/app/boards/arm/nice_nano/nice_nano.dts b/app/boards/arm/nice_nano/nice_nano.dts index 9d3b484..21b60d3 100644 --- a/app/boards/arm/nice_nano/nice_nano.dts +++ b/app/boards/arm/nice_nano/nice_nano.dts @@ -6,9 +6,6 @@ /dts-v1/; #include -#include -#include -#include #include "arduino_pro_micro_pins.dtsi" / { diff --git a/app/boards/native_posix.overlay b/app/boards/native_posix.overlay index 1a4fb13..204032a 100644 --- a/app/boards/native_posix.overlay +++ b/app/boards/native_posix.overlay @@ -1,11 +1,5 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include #include / { diff --git a/app/boards/shields/kyria/keymaps/default/keymap.overlay b/app/boards/shields/kyria/keymaps/default/keymap.overlay index 303c675..66c1a23 100644 --- a/app/boards/shields/kyria/keymaps/default/keymap.overlay +++ b/app/boards/shields/kyria/keymaps/default/keymap.overlay @@ -1,3 +1,4 @@ +#include #include #include #include @@ -11,35 +12,6 @@ compatible = "zmk,keymap"; label ="Default Kyria Keymap"; layers = <&default>; - transform = <&default_transform>; - }; - - default_transform: keymap_transform_0 { - compatible = "zmk,matrix-transform"; -// | MX6 | MX5 | MX4 | MX3 | MX2 | MX1 | | MX1 | MX2 | MX3 | MX4 | MX5 | MX6 | -// | MX12 | MX11 | MX10 | MX9 | MX8 | MX7 | | MX7 | MX8 | MX9 | MX10 | MX11 | MX12 | -// | MX20 | MX19 | MX18 | MX17 | MX16 | MX15 | MX14 | MX13 | | MX13 | MX14 | MX15 | MX16 | MX17 | MX18 | MX19 | MX20 | -// | MX25 | MX24 | MX23 | MX22 | MX21 | | MX21 | MX22 | MX23 | MX24 | MX25 | - map = < -RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,15) -RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14) RC(1,15) -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(2,12) RC(2,13) RC(2,14) RC(2,15) - RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12) - >; - }; - -// | MX5 | MX4 | MX3 | MX2 | MX1 | | MX1 | MX2 | MX3 | MX4 | MX5 | -// | MX11 | MX10 | MX9 | MX8 | MX7 | | MX7 | MX8 | MX9 | MX10 | MX11 | -// | MX19 | MX18 | MX17 | MX16 | MX15 | MX14 | MX13 | | MX13 | MX14 | MX15 | MX16 | MX17 | MX18 | MX19 | -// | MX25 | MX24 | MX23 | MX22 | MX21 | | MX21 | MX22 | MX23 | MX24 | MX25 | - five_column_transform: keymap_transform_1 { - compatible = "zmk,matrix-transform"; - map = < -RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13) -RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13) -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(2,12) RC(2,13) - RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) - >; }; layers { 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 / { 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. --- app/boards/native_posix.overlay | 25 ++++------------ app/boards/shields/kyria/keymap/keymap.overlay | 34 +++++++++++++++++++++ .../shields/kyria/keymaps/default/include/keymap.h | 5 ---- app/boards/shields/kyria/keymaps/default/keymap.c | 34 --------------------- .../shields/kyria/keymaps/default/keymap.overlay | 35 ---------------------- .../keymap/keymap.overlay | 28 ++++++----------- 6 files changed, 49 insertions(+), 112 deletions(-) create mode 100644 app/boards/shields/kyria/keymap/keymap.overlay delete mode 100644 app/boards/shields/kyria/keymaps/default/include/keymap.h delete mode 100644 app/boards/shields/kyria/keymaps/default/keymap.c delete mode 100644 app/boards/shields/kyria/keymaps/default/keymap.overlay (limited to 'app/boards') diff --git a/app/boards/native_posix.overlay b/app/boards/native_posix.overlay index 204032a..bf9ae2c 100644 --- a/app/boards/native_posix.overlay +++ b/app/boards/native_posix.overlay @@ -54,39 +54,26 @@ default: layer_0 { label = "DEFAULT"; - keys = - < - KC_A MT(MOD_LSFT, KC_B) KC_C KC_D - KC_E KC_F KC_G KC_H - >; bindings = < - &kp 5 &mo 1 &kp 10 &kp 11 - &kp 1 &kp 2 &kp 4 &kp 89>; + &kp B &mo A &kp C &kp E + &kp D &kp G &kp F &kp Q>; }; lower: layer_1 { label = "LOWER"; - keys = < - KC_A KC_B KC_C KC_D - KC_E KC_F KC_G KC_H - >; bindings = < - &kp 20 &trans &kp 18 &kp 19 - &kp 21 &kp 22 &kp 24 &kp 49>; + &kp N &trans &kp O &kp Q + &kp L &kp J &kp P &kp K>; }; raise: layer_2 { label = "RAISE"; - keys = < - KC_E KC_F KC_G KC_H - KC_A KC_B KC_C KC_D - >; bindings = < - &kp 5 &kp 0 &kp 10 &kp 11 - &kp 1 &kp 2 &kp 4 &kp 89>; + &kp W &kp U &kp I &kp N + &kp X &kp M &kp C &kp B>; }; }; }; diff --git a/app/boards/shields/kyria/keymap/keymap.overlay b/app/boards/shields/kyria/keymap/keymap.overlay new file mode 100644 index 0000000..f61bb6c --- /dev/null +++ b/app/boards/shields/kyria/keymap/keymap.overlay @@ -0,0 +1,34 @@ +#include +#include +#include + +/ { + chosen { + zmk,keymap = &keymap0; + }; + + keymap0: keymap { + compatible = "zmk,keymap"; + label ="Default Kyria Keymap"; + layers = <&default>; + }; + + layers { + compatible = "zmk,layers"; + + default: layer_0 { + label = "DEFAULT"; +// --------------------------------------------------------------------------------------------------------------------------------- +// | ESC | Q | W | E | R | T | | Y | U | I | O | P | "|" | +// | <- | A | S | D | F | G | | H | J | K | L | ; | ' | +// | SHIFT | Z | X | C | V | B | L SHIFT | L SHIFT | | L SHIFT | L SHIFT | N | M | , | . | / | - | +// | GUI | DEL | RET | SPACE | ESC | | RET | SPACE | TAB | BSPC | R-ALT | + bindings = < + &kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp PIPE + &kp BKSP &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT + &kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp LSFT &kp LSFT &kp LSFT &kp LSFT &kp N &kp M &kp CMMA &kp DOT &kp BSLH &kp MINUS + &kp LGUI &kp DEL &kp RET &kp SPC &kp ESC &kp RET &kp SPC &kp TAB &kp BKSP &kp RALT + >; + }; + }; +}; diff --git a/app/boards/shields/kyria/keymaps/default/include/keymap.h b/app/boards/shields/kyria/keymaps/default/include/keymap.h deleted file mode 100644 index 01cd9e5..0000000 --- a/app/boards/shields/kyria/keymaps/default/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/kyria/keymaps/default/keymap.c b/app/boards/shields/kyria/keymaps/default/keymap.c deleted file mode 100644 index 067cd08..0000000 --- a/app/boards/shields/kyria/keymaps/default/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/kyria/keymaps/default/keymap.overlay b/app/boards/shields/kyria/keymaps/default/keymap.overlay deleted file mode 100644 index 66c1a23..0000000 --- a/app/boards/shields/kyria/keymaps/default/keymap.overlay +++ /dev/null @@ -1,35 +0,0 @@ -#include -#include -#include -#include - -/ { - chosen { - zmk,keymap = &keymap0; - }; - - keymap0: keymap { - compatible = "zmk,keymap"; - label ="Default Kyria Keymap"; - layers = <&default>; - }; - - layers { - compatible = "zmk,layers"; - - default: layer_0 { - label = "DEFAULT"; -// --------------------------------------------------------------------------------------------------------------------------------- -// | ESC | Q | W | E | R | T | | Y | U | I | O | P | "|" | -// | <- | A | S | D | F | G | | H | J | K | L | ; | ' | -// | SHIFT | Z | X | C | V | B | L SHIFT | L SHIFT | | L SHIFT | L SHIFT | N | M | , | . | / | - | -// | GUI | DEL | RET | SPACE | ESC | | RET | SPACE | TAB | BSPC | R-ALT | - keys = < - KC_ESC KC_Q KC_W KC_E KC_R KC_T KC_Y KC_U KC_I KC_O KC_P KC_PIPE - KC_BKSP KC_A KC_S KC_D KC_F KC_G KC_H KC_J KC_K KC_L KC_SCLN KC_QUOT - KC_LSFT KC_Z KC_X KC_C KC_V KC_B KC_LSFT KC_LSFT KC_LSFT KC_LSFT KC_N KC_M KC_CMMA KC_DOT KC_BSLH KC_MIN - KC_LGUI KC_DEL KC_RET KC_SPC KC_ESC KC_RET KC_SPC KC_TAB KC_BKSP KC_RALT - >; - }; - }; -}; 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') 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') 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') 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 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. --- app/boards/native_posix.overlay | 4 +-- .../petejohanson_handwire/keymap/include/keymap.h | 5 ---- .../shields/petejohanson_handwire/keymap/keymap.c | 34 ---------------------- .../petejohanson_handwire/keymap/keymap.overlay | 26 ++++------------- 4 files changed, 8 insertions(+), 61 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') diff --git a/app/boards/native_posix.overlay b/app/boards/native_posix.overlay index bf9ae2c..e9c4c95 100644 --- a/app/boards/native_posix.overlay +++ b/app/boards/native_posix.overlay @@ -56,7 +56,7 @@ label = "DEFAULT"; bindings = < - &kp B &mo A &kp C &kp E + &kp B &mo 1 &kp C &kp E &kp D &kp G &kp F &kp Q>; }; @@ -64,7 +64,7 @@ label = "LOWER"; bindings = < - &kp N &trans &kp O &kp Q + &cp M_NEXT &trans &kp O &kp Q &kp L &kp J &kp P &kp K>; }; 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