From 583839afce4b8117e3ae7bd644954b03d0ed3ddf Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Sat, 13 Jun 2020 16:37:31 -0400 Subject: Initial refactor to have a shield/board have one default keymap. * Start of work of focusing on out-of-tree user keymaps. Add ZMK_CONFIG support. * General external configuration supported via ZMK_CONFIG, which should point to a configuration directory. * Priority order of overlay files to select. * ${SHIELD}_${BOARD}.overlay * ${SHIELD}.overlay * ${BOARD}.overlay * default.overlay * Equivalent search order for .conf files for initial Kconfig values. --- .../petejohanson_handwire/keymap/include/keymap.h | 5 +++ .../shields/petejohanson_handwire/keymap/keymap.c | 34 ++++++++++++++++++ .../petejohanson_handwire/keymap/keymap.overlay | 41 +++++++++++++++++++++ .../keymaps/default/include/keymap.h | 5 --- .../petejohanson_handwire/keymaps/default/keymap.c | 34 ------------------ .../keymaps/default/keymap.overlay | 41 --------------------- .../keymap/include/keymap.h | 9 +++++ .../petejohanson_proton_handwire/keymap/keymap.c | 34 ++++++++++++++++++ .../keymap/keymap.overlay | 42 ++++++++++++++++++++++ .../keymaps/default/include/keymap.h | 5 --- .../keymaps/default/keymap.c | 34 ------------------ .../keymaps/default/keymap.overlay | 42 ---------------------- 12 files changed, 165 insertions(+), 161 deletions(-) create mode 100644 app/boards/shields/petejohanson_handwire/keymap/include/keymap.h create mode 100644 app/boards/shields/petejohanson_handwire/keymap/keymap.c create mode 100644 app/boards/shields/petejohanson_handwire/keymap/keymap.overlay delete mode 100644 app/boards/shields/petejohanson_handwire/keymaps/default/include/keymap.h delete mode 100644 app/boards/shields/petejohanson_handwire/keymaps/default/keymap.c delete mode 100644 app/boards/shields/petejohanson_handwire/keymaps/default/keymap.overlay create mode 100644 app/boards/shields/petejohanson_proton_handwire/keymap/include/keymap.h create mode 100644 app/boards/shields/petejohanson_proton_handwire/keymap/keymap.c create mode 100644 app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay delete mode 100644 app/boards/shields/petejohanson_proton_handwire/keymaps/default/include/keymap.h delete mode 100644 app/boards/shields/petejohanson_proton_handwire/keymaps/default/keymap.c delete mode 100644 app/boards/shields/petejohanson_proton_handwire/keymaps/default/keymap.overlay (limited to 'app/boards') diff --git a/app/boards/shields/petejohanson_handwire/keymap/include/keymap.h b/app/boards/shields/petejohanson_handwire/keymap/include/keymap.h new file mode 100644 index 0000000..01cd9e5 --- /dev/null +++ b/app/boards/shields/petejohanson_handwire/keymap/include/keymap.h @@ -0,0 +1,5 @@ + +#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 new file mode 100644 index 0000000..067cd08 --- /dev/null +++ b/app/boards/shields/petejohanson_handwire/keymap/keymap.c @@ -0,0 +1,34 @@ + +#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 new file mode 100644 index 0000000..d87363f --- /dev/null +++ b/app/boards/shields/petejohanson_handwire/keymap/keymap.overlay @@ -0,0 +1,41 @@ +#include +#include + +/ { + chosen { + zmk,keymap = &keymap0; + }; + keymap0: keymap { + compatible = "zmk,keymap"; + label ="Default keymap"; + layers = <&default &lower &raise>; + }; + + layers { + compatible = "zmk,layers"; + + 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 + >; + }; + + lower: layer_1 { + label = "LOWER"; + keys = < + KC_MPLY KC_MNXT ZC_NO ZC_NO + ZC_TRNS ZC_TRNS ZC_NO ZC_NO + >; + }; + + raise: layer_2 { + label = "RAISE"; + keys = < + KC_C KC_D ZC_NO ZC_NO + ZC_TRNS ZC_TRNS ZC_NO ZC_NO>; + }; + }; +}; diff --git a/app/boards/shields/petejohanson_handwire/keymaps/default/include/keymap.h b/app/boards/shields/petejohanson_handwire/keymaps/default/include/keymap.h deleted file mode 100644 index 01cd9e5..0000000 --- a/app/boards/shields/petejohanson_handwire/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/petejohanson_handwire/keymaps/default/keymap.c b/app/boards/shields/petejohanson_handwire/keymaps/default/keymap.c deleted file mode 100644 index 067cd08..0000000 --- a/app/boards/shields/petejohanson_handwire/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/petejohanson_handwire/keymaps/default/keymap.overlay b/app/boards/shields/petejohanson_handwire/keymaps/default/keymap.overlay deleted file mode 100644 index d87363f..0000000 --- a/app/boards/shields/petejohanson_handwire/keymaps/default/keymap.overlay +++ /dev/null @@ -1,41 +0,0 @@ -#include -#include - -/ { - chosen { - zmk,keymap = &keymap0; - }; - keymap0: keymap { - compatible = "zmk,keymap"; - label ="Default keymap"; - layers = <&default &lower &raise>; - }; - - layers { - compatible = "zmk,layers"; - - 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 - >; - }; - - lower: layer_1 { - label = "LOWER"; - keys = < - KC_MPLY KC_MNXT ZC_NO ZC_NO - ZC_TRNS ZC_TRNS ZC_NO ZC_NO - >; - }; - - raise: layer_2 { - label = "RAISE"; - keys = < - KC_C KC_D ZC_NO ZC_NO - ZC_TRNS ZC_TRNS ZC_NO ZC_NO>; - }; - }; -}; diff --git a/app/boards/shields/petejohanson_proton_handwire/keymap/include/keymap.h b/app/boards/shields/petejohanson_proton_handwire/keymap/include/keymap.h new file mode 100644 index 0000000..0fd2f9f --- /dev/null +++ b/app/boards/shields/petejohanson_proton_handwire/keymap/include/keymap.h @@ -0,0 +1,9 @@ + +#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 new file mode 100644 index 0000000..bde15ac --- /dev/null +++ b/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.c @@ -0,0 +1,34 @@ + +#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 new file mode 100644 index 0000000..c1bd542 --- /dev/null +++ b/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay @@ -0,0 +1,42 @@ +#include +#include + +/ { + chosen { + zmk,keymap = &keymap0; + }; + keymap0: keymap { + compatible = "zmk,keymap"; + label ="Default keymap"; + layers = <&default &lower &raise>; + }; + + layers { + compatible = "zmk,layers"; + + default: layer_0 { + label = "DEFAULT"; + keys = + < + KC_A MT(MOD_LSFT, KC_B) + CC_RAIS CC_LOWR + >; + }; + + lower: layer_1 { + label = "LOWER"; + keys = < + KC_MPLY KC_MNXT + ZC_TRNS ZC_TRNS + >; + }; + + raise: layer_2 { + label = "RAISE"; + keys = < + KC_C KC_D + ZC_TRNS ZC_TRNS + >; + }; + }; +}; diff --git a/app/boards/shields/petejohanson_proton_handwire/keymaps/default/include/keymap.h b/app/boards/shields/petejohanson_proton_handwire/keymaps/default/include/keymap.h deleted file mode 100644 index 01cd9e5..0000000 --- a/app/boards/shields/petejohanson_proton_handwire/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/petejohanson_proton_handwire/keymaps/default/keymap.c b/app/boards/shields/petejohanson_proton_handwire/keymaps/default/keymap.c deleted file mode 100644 index 067cd08..0000000 --- a/app/boards/shields/petejohanson_proton_handwire/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/petejohanson_proton_handwire/keymaps/default/keymap.overlay b/app/boards/shields/petejohanson_proton_handwire/keymaps/default/keymap.overlay deleted file mode 100644 index c1bd542..0000000 --- a/app/boards/shields/petejohanson_proton_handwire/keymaps/default/keymap.overlay +++ /dev/null @@ -1,42 +0,0 @@ -#include -#include - -/ { - chosen { - zmk,keymap = &keymap0; - }; - keymap0: keymap { - compatible = "zmk,keymap"; - label ="Default keymap"; - layers = <&default &lower &raise>; - }; - - layers { - compatible = "zmk,layers"; - - default: layer_0 { - label = "DEFAULT"; - keys = - < - KC_A MT(MOD_LSFT, KC_B) - CC_RAIS CC_LOWR - >; - }; - - lower: layer_1 { - label = "LOWER"; - keys = < - KC_MPLY KC_MNXT - ZC_TRNS ZC_TRNS - >; - }; - - raise: layer_2 { - label = "RAISE"; - keys = < - KC_C KC_D - ZC_TRNS ZC_TRNS - >; - }; - }; -}; -- cgit v1.2.3