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_TOPROWCOMBOS_TERM 50
#define MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(layer, position, binding) \
toprowcombos_ ## layer ## _ ## position { \
layers = <layer>; \
key-positions = <MIRYOKU_KLUDGE_TOPROWCOMBOS_ ## position>; \
bindings = <binding>; \
#define MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(LAYER, POSITION, BINDING) \
toprowcombos_ ## LAYER ## _ ## POSITION { \
layers = <LAYER>; \
key-positions = <MIRYOKU_KLUDGE_TOPROWCOMBOS_ ## POSITION>; \
bindings = <BINDING>; \
timeout-ms = <MIRYOKU_KLUDGE_TOPROWCOMBOS_TERM>; \
};
@@ -40,47 +40,47 @@ toprowcombos_ ## layer ## _ ## position { \
#elif defined (MIRYOKU_ALPHAS_QWERTY)
#elif defined (MIRYOKU_ALPHAS_QWERTZ)
#else
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(BASE, LEFTPINKIE, &kp Q)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(BASE, LEFTINNERINDEX, &kp B)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(BASE, RIGHTINNERINDEX, &kp J)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(BASE, RIGHTPINKIE, &kp SQT)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_BASE, LEFTPINKIE, &kp Q)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_BASE, LEFTINNERINDEX, &kp B)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_BASE, RIGHTINNERINDEX, &kp J)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_BASE, RIGHTPINKIE, &kp SQT)
#endif
#if defined (MIRYOKU_NAV_INVERTEDT)
#elif defined (MIRYOKU_NAV_VI)
#else
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(NAV, LEFTPINKIE, &bootloader)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(NAV, LEFTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(NAV, RIGHTINNERINDEX, U_RDO)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(NAV, RIGHTPINKIE, U_UND)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_NAV, LEFTPINKIE, &bootloader)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_NAV, LEFTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_NAV, RIGHTINNERINDEX, U_RDO)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_NAV, RIGHTPINKIE, U_UND)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(MOUSE, LEFTPINKIE, &bootloader)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(MOUSE, LEFTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(MOUSE, RIGHTINNERINDEX, U_RDO)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(MOUSE, RIGHTPINKIE, U_UND)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_MOUSE, LEFTPINKIE, &bootloader)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_MOUSE, LEFTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_MOUSE, RIGHTINNERINDEX, U_RDO)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_MOUSE, RIGHTPINKIE, U_UND)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(MEDIA, LEFTPINKIE, &bootloader)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(MEDIA, LEFTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(MEDIA, RIGHTINNERINDEX, &rgb_ug RGB_TOG)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(MEDIA, RIGHTPINKIE, &rgb_ug RGB_BRI)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_MEDIA, LEFTPINKIE, &bootloader)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_MEDIA, LEFTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_MEDIA, RIGHTINNERINDEX, &rgb_ug RGB_TOG)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_MEDIA, RIGHTPINKIE, &u_rgb_bri)
#endif
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(NUM, LEFTPINKIE, &kp LBKT)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(NUM, LEFTINNERINDEX, &kp RBKT)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(NUM, RIGHTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(NUM, RIGHTPINKIE, &bootloader)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_NUM, LEFTPINKIE, &kp LBKT)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_NUM, LEFTINNERINDEX, &kp RBKT)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_NUM, RIGHTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_NUM, RIGHTPINKIE, &bootloader)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(SYM, LEFTPINKIE, &kp LBRC)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(SYM, LEFTINNERINDEX, &kp RBRC)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(SYM, RIGHTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(SYM, RIGHTPINKIE, &bootloader)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_SYM, LEFTPINKIE, &kp LBRC)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_SYM, LEFTINNERINDEX, &kp RBRC)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_SYM, RIGHTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_SYM, RIGHTPINKIE, &bootloader)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(FUN, LEFTPINKIE, &kp F12)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(FUN, LEFTINNERINDEX, &kp PSCRN)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(FUN, RIGHTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(FUN, RIGHTPINKIE, &bootloader)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_FUN, LEFTPINKIE, &kp F12)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_FUN, LEFTINNERINDEX, &kp PSCRN)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_FUN, RIGHTINNERINDEX, U_NA)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_FUN, RIGHTPINKIE, &bootloader)
#endif
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(BUTTON, LEFTPINKIE, U_UND)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(BUTTON, LEFTINNERINDEX, U_RDO)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(BUTTON, RIGHTINNERINDEX, U_RDO)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(BUTTON, RIGHTPINKIE, U_UND)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_BUTTON, LEFTPINKIE, U_UND)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_BUTTON, LEFTINNERINDEX, U_RDO)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_BUTTON, RIGHTINNERINDEX, U_RDO)
MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_BUTTON, RIGHTPINKIE, U_UND)
};
};