Change to X macros for layer list

- Supports adding and removing layers from custom_config.h
- Add "U_" prefix to layer names
- Populate keymap from X macro
- Rename miryoku_alternatives.h to miryoku_layer_alternatives.h
- Rename miryoku_layer.h to miryoku_layer_selection.h
- Remove miryoku_layer_names.h
- Add miryoku_layer_list.h
This commit is contained in:
Manna Harbour
2022-05-15 17:26:40 +10:00
parent 657fae077a
commit 4c51e25422
9 changed files with 228 additions and 243 deletions

View File

@@ -2,11 +2,11 @@
// https://github.com/manna-harbour/miryoku
#define MIRYOKU_KLUDGE_THUMBCOMBOS_TERM 200
#define MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(layer, position, binding) \
thumbcombos_ ## layer ## _ ## position { \
layers = <layer>; \
key-positions = <MIRYOKU_KLUDGE_THUMBCOMBOS_ ## position>; \
bindings = <binding>; \
#define MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(LAYER, POSITION, BINDING) \
thumbcombos_ ## LAYER ## _ ## POSITION { \
layers = <LAYER>; \
key-positions = <MIRYOKU_KLUDGE_THUMBCOMBOS_ ## POSITION>; \
bindings = <BINDING>; \
timeout-ms = <MIRYOKU_KLUDGE_THUMBCOMBOS_TERM>; \
};
@@ -15,37 +15,37 @@ thumbcombos_ ## layer ## _ ## position { \
compatible = "zmk,combos";
#if defined (MIRYOKU_LAYERS_FLIP)
#if defined (MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BASE, LEFT, &lt FUN DEL)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(EXTRA, LEFT, &lt FUN DEL)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, LEFT, U_BTN3)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NAV, LEFT, &kp DEL)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MOUSE, LEFT, U_BTN3)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MEDIA, LEFT, &kp C_MUTE)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_BASE, LEFT, &lt U_FUN DEL)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_EXTRA, LEFT, &lt U_FUN DEL)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_BUTTON, LEFT, U_BTN3)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_NAV, LEFT, &kp DEL)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_MOUSE, LEFT, U_BTN3)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_MEDIA, LEFT, &kp C_MUTE)
#endif
#if defined (MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BASE, RIGHT, &lt MEDIA ESC)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(EXTRA, RIGHT, &lt MEDIA ESC)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, RIGHT, U_BTN3)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NUM, RIGHT, &kp DOT)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(SYM, RIGHT, &kp RPAR)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(FUN, RIGHT, &kp K_APP)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_BASE, RIGHT, &lt U_MEDIA ESC)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_EXTRA, RIGHT, &lt U_MEDIA ESC)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_BUTTON, RIGHT, U_BTN3)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_NUM, RIGHT, &kp DOT)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_SYM, RIGHT, &kp RPAR)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_FUN, RIGHT, &kp K_APP)
#endif
#else
#if defined (MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BASE, LEFT, &lt MEDIA ESC)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(EXTRA, LEFT, &lt MEDIA ESC)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, LEFT, U_BTN3)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NUM, LEFT, &kp DOT)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(SYM, LEFT, &kp LPAR)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(FUN, LEFT, &kp K_APP)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_BASE, LEFT, &lt U_MEDIA ESC)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_EXTRA, LEFT, &lt U_MEDIA ESC)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_BUTTON, LEFT, U_BTN3)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_NUM, LEFT, &kp DOT)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_SYM, LEFT, &kp LPAR)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_FUN, LEFT, &kp K_APP)
#endif
#if defined (MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BASE, RIGHT, &lt FUN DEL)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(EXTRA, RIGHT, &lt FUN DEL)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, RIGHT, U_BTN3)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NAV, RIGHT, &kp DEL)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MOUSE, RIGHT, U_BTN3)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MEDIA, RIGHT, &kp C_MUTE)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_BASE, RIGHT, &lt U_FUN DEL)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_EXTRA, RIGHT, &lt U_FUN DEL)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_BUTTON, RIGHT, U_BTN3)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_NAV, RIGHT, &kp DEL)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_MOUSE, RIGHT, U_BTN3)
MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_MEDIA, RIGHT, &kp C_MUTE)
#endif
#endif
};