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_BOTTOMROWCOMBOS_TERM 50
#define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(layer, position, binding) \
bottomrowcombos_ ## layer ## _ ## position { \
layers = <layer>; \
key-positions = <MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_ ## position>; \
bindings = <binding>; \
#define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(LAYER, POSITION, BINDING) \
bottomrowcombos_ ## LAYER ## _ ## POSITION { \
layers = <LAYER>; \
key-positions = <MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_ ## POSITION>; \
bindings = <BINDING>; \
timeout-ms = <MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_TERM>; \
};
@@ -40,47 +40,47 @@ bottomrowcombos_ ## layer ## _ ## position { \
#elif defined (MIRYOKU_ALPHAS_QWERTY)
#elif defined (MIRYOKU_ALPHAS_QWERTZ)
#else
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(BASE, LEFTPINKIE, &lt BUTTON Z)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(BASE, LEFTINNERINDEX, &kp V)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(BASE, RIGHTINNERINDEX, &kp K)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(BASE, RIGHTPINKIE, &lt BUTTON SLASH)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_BASE, LEFTPINKIE, &lt U_BUTTON Z)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_BASE, LEFTINNERINDEX, &kp V)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_BASE, RIGHTINNERINDEX, &kp K)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_BASE, RIGHTPINKIE, &lt U_BUTTON SLASH)
#endif
#if defined (MIRYOKU_NAV_INVERTEDT)
#elif defined (MIRYOKU_NAV_VI)
#else
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(NAV, LEFTPINKIE, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(NAV, LEFTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(NAV, RIGHTINNERINDEX, &kp INS)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(NAV, RIGHTPINKIE, &kp END)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_NAV, LEFTPINKIE, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_NAV, LEFTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_NAV, RIGHTINNERINDEX, &kp INS)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_NAV, RIGHTPINKIE, &kp END)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(MOUSE, LEFTPINKIE, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(MOUSE, LEFTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(MOUSE, RIGHTINNERINDEX, U_NU)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(MOUSE, RIGHTPINKIE, U_WH_R)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_MOUSE, LEFTPINKIE, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_MOUSE, LEFTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_MOUSE, RIGHTINNERINDEX, U_NU)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_MOUSE, RIGHTPINKIE, U_WH_R)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(MEDIA, LEFTPINKIE, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(MEDIA, LEFTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(MEDIA, RIGHTINNERINDEX, &bt BT_CLR)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(MEDIA, RIGHTPINKIE, &bt BT_SEL 3)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_MEDIA, LEFTPINKIE, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_MEDIA, LEFTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_MEDIA, RIGHTINNERINDEX, &u_out_tog)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_MEDIA, RIGHTPINKIE, &u_bt_sel_3)
#endif
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(NUM, LEFTPINKIE, &kp GRAVE)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(NUM, LEFTINNERINDEX, &kp BSLH)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(NUM, RIGHTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(NUM, RIGHTPINKIE, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_NUM, LEFTPINKIE, &kp GRAVE)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_NUM, LEFTINNERINDEX, &kp BSLH)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_NUM, RIGHTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_NUM, RIGHTPINKIE, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(SYM, LEFTPINKIE, &kp TILDE)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(SYM, LEFTINNERINDEX, &kp PIPE)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(SYM, RIGHTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(SYM, RIGHTPINKIE, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_SYM, LEFTPINKIE, &kp TILDE)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_SYM, LEFTINNERINDEX, &kp PIPE)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_SYM, RIGHTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_SYM, RIGHTPINKIE, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(FUN, LEFTPINKIE, &kp F10)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(FUN, LEFTINNERINDEX, &kp PAUSE_BREAK)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(FUN, RIGHTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(FUN, RIGHTPINKIE, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_FUN, LEFTPINKIE, &kp F10)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_FUN, LEFTINNERINDEX, &kp PAUSE_BREAK)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_FUN, RIGHTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_FUN, RIGHTPINKIE, U_NA)
#endif
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(BUTTON, LEFTPINKIE, U_UND)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(BUTTON, LEFTINNERINDEX, U_RDO)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(BUTTON, RIGHTINNERINDEX, U_RDO)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(BUTTON, RIGHTPINKIE, U_UND)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_BUTTON, LEFTPINKIE, U_UND)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_BUTTON, LEFTINNERINDEX, U_RDO)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_BUTTON, RIGHTINNERINDEX, U_RDO)
MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_BUTTON, RIGHTPINKIE, U_UND)
};
};