From 5959a323904836426b926c205977497e0757e721 Mon Sep 17 00:00:00 2001 From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com> Date: Fri, 20 May 2022 13:46:55 +1000 Subject: [PATCH] Make mapping macro customisable per keyboard --- miryoku/mapping/32/hummingbird.h | 8 +++++++- miryoku/mapping/34/ble_chiffre.h | 10 ++++++++-- miryoku/mapping/34/ferris.h | 10 ++++++++-- miryoku/mapping/34/osprette.h | 10 ++++++++-- miryoku/mapping/36/minidox.h | 8 +++++++- miryoku/mapping/38/draculad.h | 8 +++++++- miryoku/mapping/39/reviung39.h | 10 ++++++++-- miryoku/mapping/40/gatoraid40.h | 10 ++++++++-- miryoku/mapping/41/reviung41.h | 10 ++++++++-- miryoku/mapping/42/barobord.h | 8 +++++++- miryoku/mapping/42/corne.h | 8 +++++++- miryoku/mapping/42/elephant42.h | 10 ++++++++-- miryoku/mapping/44/jian.h | 10 ++++++++-- miryoku/mapping/44/technikable.h | 14 ++++++++++---- miryoku/mapping/45/ffkb.h | 8 +++++++- miryoku/mapping/46/tightyl.h | 10 ++++++++-- miryoku/mapping/48/bat43.h | 10 ++++++++-- miryoku/mapping/48/hillside48.h | 10 ++++++++-- miryoku/mapping/48/lets_split.h | 12 +++++++++--- miryoku/mapping/48/planck.h | 12 +++++++++--- miryoku/mapping/50/kyria.h | 12 +++++++++--- miryoku/mapping/52/horizon.h | 10 ++++++++-- miryoku/mapping/53/klacker_bs.h | 8 +++++++- miryoku/mapping/54/ergotravel.h | 8 +++++++- miryoku/mapping/56/iris.h | 10 ++++++++-- miryoku/mapping/56/jiran.h | 10 ++++++++-- miryoku/mapping/58/bastyl.h | 10 ++++++++-- miryoku/mapping/58/lily58.h | 10 ++++++++-- miryoku/mapping/60/lotus58.h | 8 +++++++- miryoku/mapping/60/naked60.h | 12 +++++++++--- miryoku/mapping/60/preonic.h | 12 +++++++++--- miryoku/mapping/60/sofle.h | 10 ++++++++-- miryoku/mapping/62/atreus.h | 10 ++++++++-- miryoku/mapping/63/rebound.h | 10 ++++++++-- miryoku/mapping/64/helix.h | 10 ++++++++-- miryoku/mapping/66/breeze.h | 8 +++++++- miryoku/mapping/66/pinkiesout.h | 8 +++++++- miryoku/mapping/70/ergodash.h | 10 ++++++++-- miryoku/mapping/70/viterbi.h | 12 +++++++++--- miryoku/mapping/70/zodiark.h | 10 ++++++++-- miryoku/mapping/80/glove80.h | 8 +++++++- miryoku/mapping/82/adv360.h | 8 +++++++- 42 files changed, 331 insertions(+), 79 deletions(-) diff --git a/miryoku/mapping/32/hummingbird.h b/miryoku/mapping/32/hummingbird.h index bf1a050..1f8b43f 100644 --- a/miryoku/mapping/32/hummingbird.h +++ b/miryoku/mapping/32/hummingbird.h @@ -1,7 +1,9 @@ // Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku -#define MIRYOKU_MAPPING( \ +#if !defined (MIRYOKU_LAYOUTMAPPING_HUMMINGBIRD) + +#define MIRYOKU_LAYOUTMAPPING_HUMMINGBIRD( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -26,3 +28,7 @@ K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 26 27 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 28 29 #define MIRYOKU_KLUDGE_THUMBCOMBOS + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_HUMMINGBIRD diff --git a/miryoku/mapping/34/ble_chiffre.h b/miryoku/mapping/34/ble_chiffre.h index fef003b..182d0ea 100644 --- a/miryoku/mapping/34/ble_chiffre.h +++ b/miryoku/mapping/34/ble_chiffre.h @@ -1,7 +1,9 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku -#define MIRYOKU_MAPPING( \ +#if !defined (MIRYOKU_LAYOUTMAPPING_BLE_CHIFFRE) + +#define MIRYOKU_LAYOUTMAPPING_BLE_CHIFFRE( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -16,3 +18,7 @@ K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 32 33 #define MIRYOKU_KLUDGE_THUMBCOMBOS + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_BLE_CHIFFRE diff --git a/miryoku/mapping/34/ferris.h b/miryoku/mapping/34/ferris.h index b281b69..0a60da4 100644 --- a/miryoku/mapping/34/ferris.h +++ b/miryoku/mapping/34/ferris.h @@ -1,7 +1,9 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku -#define MIRYOKU_MAPPING( \ +#if !defined (MIRYOKU_LAYOUTMAPPING_FERRIS) + +#define MIRYOKU_LAYOUTMAPPING_FERRIS( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -16,3 +18,7 @@ K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 32 33 #define MIRYOKU_KLUDGE_THUMBCOMBOS + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_FERRIS diff --git a/miryoku/mapping/34/osprette.h b/miryoku/mapping/34/osprette.h index 219a59a..63b52f1 100644 --- a/miryoku/mapping/34/osprette.h +++ b/miryoku/mapping/34/osprette.h @@ -1,7 +1,9 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku -#define MIRYOKU_MAPPING( \ +#if !defined (MIRYOKU_LAYOUTMAPPING_OSPRETTE) + +#define MIRYOKU_LAYOUTMAPPING_OSPRETTE( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -16,3 +18,7 @@ K00 K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 K09 \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 32 33 #define MIRYOKU_KLUDGE_THUMBCOMBOS + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_OSPRETTE diff --git a/miryoku/mapping/36/minidox.h b/miryoku/mapping/36/minidox.h index 71567b8..9020fc5 100644 --- a/miryoku/mapping/36/minidox.h +++ b/miryoku/mapping/36/minidox.h @@ -1,7 +1,9 @@ // Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku -#define MIRYOKU_MAPPING( \ +#if !defined (MIRYOKU_LAYOUTMAPPING_MINIDOX) + +#define MIRYOKU_LAYOUTMAPPING_MINIDOX( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -25,3 +27,7 @@ K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 31 32 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 33 34 + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_MINIDOX diff --git a/miryoku/mapping/38/draculad.h b/miryoku/mapping/38/draculad.h index 888a113..49d7240 100644 --- a/miryoku/mapping/38/draculad.h +++ b/miryoku/mapping/38/draculad.h @@ -1,9 +1,11 @@ // Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_DRACULAD) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_DRACULAD( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -21,3 +23,7 @@ K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 33 34 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 35 36 + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_DRACULAD diff --git a/miryoku/mapping/39/reviung39.h b/miryoku/mapping/39/reviung39.h index 190b771..4afc16d 100644 --- a/miryoku/mapping/39/reviung39.h +++ b/miryoku/mapping/39/reviung39.h @@ -1,9 +1,11 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_REVIUNG39) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_REVIUNG39( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -13,3 +15,7 @@ K32 K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 XXX \ K34 K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 K37 \ K32 K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \ K33 K35 K36 + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_REVIUNG39 diff --git a/miryoku/mapping/40/gatoraid40.h b/miryoku/mapping/40/gatoraid40.h index 03d8f28..f399350 100644 --- a/miryoku/mapping/40/gatoraid40.h +++ b/miryoku/mapping/40/gatoraid40.h @@ -1,9 +1,11 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_GATORAID40) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_GATORAID40( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -16,3 +18,7 @@ XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 35 36 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 37 38 + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_GATORAID40 diff --git a/miryoku/mapping/41/reviung41.h b/miryoku/mapping/41/reviung41.h index 3683935..5999cb6 100644 --- a/miryoku/mapping/41/reviung41.h +++ b/miryoku/mapping/41/reviung41.h @@ -1,9 +1,11 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_REVIUNG41) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_REVIUNG41( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -13,3 +15,7 @@ XXX K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 XXX \ K34 K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \ XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \ K32 K33 K35 K36 K37 + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_REVIUNG41 diff --git a/miryoku/mapping/42/barobord.h b/miryoku/mapping/42/barobord.h index 6ac720d..fe4708b 100644 --- a/miryoku/mapping/42/barobord.h +++ b/miryoku/mapping/42/barobord.h @@ -1,9 +1,11 @@ // Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_BAROBORD) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_BAROBORD( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -14,3 +16,7 @@ K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 \ K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 \ XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX \ XXX XXX + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_BAROBORD diff --git a/miryoku/mapping/42/corne.h b/miryoku/mapping/42/corne.h index bab82c1..fd35420 100644 --- a/miryoku/mapping/42/corne.h +++ b/miryoku/mapping/42/corne.h @@ -1,9 +1,11 @@ // Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_CORNE) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_CORNE( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -27,3 +29,7 @@ XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 37 38 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 39 40 + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_CORNE diff --git a/miryoku/mapping/42/elephant42.h b/miryoku/mapping/42/elephant42.h index fdce3e9..eab3f7e 100644 --- a/miryoku/mapping/42/elephant42.h +++ b/miryoku/mapping/42/elephant42.h @@ -1,10 +1,12 @@ // Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_ELEPHANT42) + #define XXX &none #if defined MIRYOKU_MAPPING_EXTENDED_THUMBS -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_ELEPHANT42(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -17,7 +19,7 @@ XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 37 36 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 38 39 #else -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_ELEPHANT42(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -30,3 +32,7 @@ XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 35 36 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 39 40 #endif + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_ELEPHANT42 diff --git a/miryoku/mapping/44/jian.h b/miryoku/mapping/44/jian.h index 02f26fe..fc297e4 100644 --- a/miryoku/mapping/44/jian.h +++ b/miryoku/mapping/44/jian.h @@ -1,9 +1,11 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_JIAN) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_JIAN( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -16,3 +18,7 @@ XXX XXX K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 XXX XXX \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 39 40 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 41 42 + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_JIAN diff --git a/miryoku/mapping/44/technikable.h b/miryoku/mapping/44/technikable.h index 96f21b6..8302173 100644 --- a/miryoku/mapping/44/technikable.h +++ b/miryoku/mapping/44/technikable.h @@ -1,10 +1,12 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_TECHNIKABLE) + #define XXX &none #if defined (MIRYOKU_MAPPING_EXTENDED_THUMBS) -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_TECHNIKABLE(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -15,7 +17,7 @@ K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 \ K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \ XXX K32 K33 K34 K35 K36 K37 XXX #elif defined (MIRYOKU_MAPPING_2X2U) -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_TECHNIKABLE(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -26,7 +28,7 @@ K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 \ K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \ K32 K33 K34 K35 K36 K37 #else -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_TECHNIKABLE(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -48,3 +50,7 @@ K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \ #endif }; }; + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_TECHNIKABLE diff --git a/miryoku/mapping/45/ffkb.h b/miryoku/mapping/45/ffkb.h index 7685697..84d62ba 100644 --- a/miryoku/mapping/45/ffkb.h +++ b/miryoku/mapping/45/ffkb.h @@ -1,9 +1,11 @@ // Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_FFKB) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_FFKB( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -13,3 +15,7 @@ XXX K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 XXX \ XXX K10 K11 K12 K13 K14 XXX K15 K16 K17 K18 K19 XXX \ XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \ XXX K32 K33 K34 K35 K36 K37 XXX + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_FFKB diff --git a/miryoku/mapping/46/tightyl.h b/miryoku/mapping/46/tightyl.h index b14e2bf..5111255 100644 --- a/miryoku/mapping/46/tightyl.h +++ b/miryoku/mapping/46/tightyl.h @@ -1,9 +1,11 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_TIGHTYL) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_TIGHTYL( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -13,3 +15,7 @@ XXX K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 XXX \ XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \ XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \ XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_TIGHTYL diff --git a/miryoku/mapping/48/bat43.h b/miryoku/mapping/48/bat43.h index cf333b2..985c00f 100644 --- a/miryoku/mapping/48/bat43.h +++ b/miryoku/mapping/48/bat43.h @@ -1,9 +1,11 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_BAT43) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_BAT43( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -14,3 +16,7 @@ XXX K10 K11 K12 K13 K14 XXX K15 K16 K17 K18 K19 XXX \ XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \ K32 K33 K34 K35 K36 K37 \ XXX XXX XXX XXX XXX + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_BAT43 diff --git a/miryoku/mapping/48/hillside48.h b/miryoku/mapping/48/hillside48.h index 1b4efb8..10cec0b 100644 --- a/miryoku/mapping/48/hillside48.h +++ b/miryoku/mapping/48/hillside48.h @@ -1,10 +1,12 @@ // Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_HILLSIDE48) + #define XXX &none #if defined MIRYOKU_MAPPING_EXTENDED_THUMBS -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_HILLSIDE48(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -17,7 +19,7 @@ XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 41 42 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 43 44 #else -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_HILLSIDE48(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -30,3 +32,7 @@ XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 40 41 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 44 45 #endif + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_HILLSIDE48 diff --git a/miryoku/mapping/48/lets_split.h b/miryoku/mapping/48/lets_split.h index d188a2a..691c4d7 100644 --- a/miryoku/mapping/48/lets_split.h +++ b/miryoku/mapping/48/lets_split.h @@ -1,10 +1,12 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_LETS_SPLIT) + #define XXX &none #if defined MIRYOKU_MAPPING_PINKIE_STAGGER -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_LETS_SPLIT(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -15,7 +17,7 @@ K00 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K09 \ K10 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K19 \ K20 XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX K29 #else -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_LETS_SPLIT(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -26,3 +28,7 @@ K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 \ K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \ XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX #endif + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_LETS_SPLIT diff --git a/miryoku/mapping/48/planck.h b/miryoku/mapping/48/planck.h index 65ee1a1..026bab2 100644 --- a/miryoku/mapping/48/planck.h +++ b/miryoku/mapping/48/planck.h @@ -1,10 +1,12 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_PLANCK) + #define XXX &none #if defined MIRYOKU_MAPPING_EXTENDED_THUMBS -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_PLANCK(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -15,7 +17,7 @@ K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 \ K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \ XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX #else -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_PLANCK(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -26,3 +28,7 @@ K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 \ K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \ XXX XXX K32 K33 K34 XXX XXX K35 K36 K37 XXX XXX #endif + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_PLANCK diff --git a/miryoku/mapping/50/kyria.h b/miryoku/mapping/50/kyria.h index 7c99853..423e0e3 100644 --- a/miryoku/mapping/50/kyria.h +++ b/miryoku/mapping/50/kyria.h @@ -1,10 +1,12 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_KYRIA) + #define XXX &none #if defined MIRYOKU_MAPPING_EXTENDED_THUMBS -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_KYRIA(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -17,7 +19,7 @@ XXX K20 K21 K22 K23 K24 XXX XXX XXX XXX K25 K26 K27 K28 K29 #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 43 44 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 45 46 #else -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_KYRIA(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -30,3 +32,7 @@ XXX K20 K21 K22 K23 K24 XXX XXX XXX XXX K25 K26 K27 K28 K29 #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 42 43 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 46 47 #endif + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_KYRIA diff --git a/miryoku/mapping/52/horizon.h b/miryoku/mapping/52/horizon.h index 0b7d2f1..10592f0 100644 --- a/miryoku/mapping/52/horizon.h +++ b/miryoku/mapping/52/horizon.h @@ -1,10 +1,12 @@ // Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_HORIZON) + #define XXX &none #if defined MIRYOKU_MAPPING_EXTENDED_THUMBS -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_HORIZON(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -15,7 +17,7 @@ K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 \ K20 K21 K22 K23 K24 XXX XXX XXX XXX K25 K26 K27 K28 K29 \ XXX XXX XXX K32 K33 K34 XXX XXX K35 K36 K37 XXX XXX XXX #else -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_HORIZON(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -26,3 +28,7 @@ K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 \ K20 K21 K22 K23 K24 XXX XXX XXX XXX K25 K26 K27 K28 K29 \ XXX XXX K32 K33 K34 XXX XXX XXX XXX K35 K36 K37 XXX XXX #endif + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_HORIZON diff --git a/miryoku/mapping/53/klacker_bs.h b/miryoku/mapping/53/klacker_bs.h index 46f6f78..b11d2f9 100644 --- a/miryoku/mapping/53/klacker_bs.h +++ b/miryoku/mapping/53/klacker_bs.h @@ -1,9 +1,11 @@ // Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_KLACKER_BS) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_KLACKER_BS( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -19,3 +21,7 @@ XXX XXX XXX XXX XXX XXX XXX XXX XXX \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 51 52 #define MIRYOKU_KLUDGE_THUMBCOMBOS + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_KLACKER_BS diff --git a/miryoku/mapping/54/ergotravel.h b/miryoku/mapping/54/ergotravel.h index 96e41bf..94f2929 100644 --- a/miryoku/mapping/54/ergotravel.h +++ b/miryoku/mapping/54/ergotravel.h @@ -1,9 +1,11 @@ // Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_ERGOTRAVEL) + #define XXX &none -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_ERGOTRAVEL(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -13,3 +15,7 @@ XXX K00 K01 K02 K03 K04 XXX XXX K05 K06 K07 K08 K09 XXX \ XXX K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 XXX \ XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \ XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_ERGOTRAVEL diff --git a/miryoku/mapping/56/iris.h b/miryoku/mapping/56/iris.h index e217946..6764f19 100644 --- a/miryoku/mapping/56/iris.h +++ b/miryoku/mapping/56/iris.h @@ -1,9 +1,11 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_IRIS) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_IRIS( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -17,3 +19,7 @@ XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 51 52 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 53 54 + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_IRIS diff --git a/miryoku/mapping/56/jiran.h b/miryoku/mapping/56/jiran.h index 207272b..d97c6cd 100644 --- a/miryoku/mapping/56/jiran.h +++ b/miryoku/mapping/56/jiran.h @@ -1,9 +1,11 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_JIRAN) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_JIRAN( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -17,3 +19,7 @@ XXX XXX K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 XXX XXX \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 51 52 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 53 54 + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_JIRAN diff --git a/miryoku/mapping/58/bastyl.h b/miryoku/mapping/58/bastyl.h index 133290a..01092b6 100644 --- a/miryoku/mapping/58/bastyl.h +++ b/miryoku/mapping/58/bastyl.h @@ -1,9 +1,11 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_BASTYL) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_BASTYL( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -18,3 +20,7 @@ XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 49 50 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 51 52 + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_BASTYL diff --git a/miryoku/mapping/58/lily58.h b/miryoku/mapping/58/lily58.h index 05a4322..36503ad 100644 --- a/miryoku/mapping/58/lily58.h +++ b/miryoku/mapping/58/lily58.h @@ -1,9 +1,11 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_LILY58) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_LILY58( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -17,3 +19,7 @@ XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 52 53 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 54 55 + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_LILY58 diff --git a/miryoku/mapping/60/lotus58.h b/miryoku/mapping/60/lotus58.h index ab48b0b..60c05d0 100644 --- a/miryoku/mapping/60/lotus58.h +++ b/miryoku/mapping/60/lotus58.h @@ -1,9 +1,11 @@ // Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_LOTUS58) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_LOTUS58( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -17,3 +19,7 @@ XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 54 55 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 56 57 + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_LOTUS58 diff --git a/miryoku/mapping/60/naked60.h b/miryoku/mapping/60/naked60.h index 5996448..8100007 100644 --- a/miryoku/mapping/60/naked60.h +++ b/miryoku/mapping/60/naked60.h @@ -1,10 +1,12 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_NAKED60) + #define XXX &none #if defined MIRYOKU_MAPPING_EXTENDED_THUMBS -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_NAKED60(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -16,7 +18,7 @@ XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \ XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \ XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX #else -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_NAKED60(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -28,3 +30,7 @@ XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \ XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \ XXX XXX K32 K33 K34 XXX XXX K35 K36 K37 XXX XXX #endif + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_NAKED60 diff --git a/miryoku/mapping/60/preonic.h b/miryoku/mapping/60/preonic.h index b5a35e7..edd8d91 100644 --- a/miryoku/mapping/60/preonic.h +++ b/miryoku/mapping/60/preonic.h @@ -1,10 +1,12 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_PREONIC) + #define XXX &none #if defined MIRYOKU_MAPPING_EXTENDED_THUMBS -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_PREONIC(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -16,7 +18,7 @@ K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 \ K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \ XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX #else -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_PREONIC(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -28,3 +30,7 @@ K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 \ K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \ XXX XXX K32 K33 K34 XXX XXX K35 K36 K37 XXX XXX #endif + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_PREONIC diff --git a/miryoku/mapping/60/sofle.h b/miryoku/mapping/60/sofle.h index e3a9b41..a232625 100644 --- a/miryoku/mapping/60/sofle.h +++ b/miryoku/mapping/60/sofle.h @@ -1,9 +1,11 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_SOFLE) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_SOFLE( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -17,3 +19,7 @@ XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \ #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 53 54 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 55 56 + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_SOFLE diff --git a/miryoku/mapping/62/atreus.h b/miryoku/mapping/62/atreus.h index a09e225..a760f25 100644 --- a/miryoku/mapping/62/atreus.h +++ b/miryoku/mapping/62/atreus.h @@ -1,9 +1,11 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_ATREUS) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_ATREUS( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -17,3 +19,7 @@ XXX XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX XXX #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 53 54 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 55 56 + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_ATREUS diff --git a/miryoku/mapping/63/rebound.h b/miryoku/mapping/63/rebound.h index 23a1303..a7681e9 100644 --- a/miryoku/mapping/63/rebound.h +++ b/miryoku/mapping/63/rebound.h @@ -1,9 +1,11 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_REBOUND) + #define XXX &none -#define MIRYOKU_MAPPING(\ +#define MIRYOKU_LAYOUTMAPPING_REBOUND(\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -14,3 +16,7 @@ K00 K01 K02 K03 K04 XXX XXX K05 K06 K07 K08 K09 \ K10 K11 K12 K13 K14 XXX XXX XXX K15 K16 K17 K18 K19 \ K20 K21 K22 K23 K24 XXX XXX XXX K25 K26 K27 K28 K29 \ XXX XXX XXX K32 K33 K34 XXX K35 K36 K37 XXX XXX XXX + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_REBOUND diff --git a/miryoku/mapping/64/helix.h b/miryoku/mapping/64/helix.h index 7879fdc..8fba813 100644 --- a/miryoku/mapping/64/helix.h +++ b/miryoku/mapping/64/helix.h @@ -1,9 +1,11 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_HELIX) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_HELIX( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -17,3 +19,7 @@ XXX XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX XXX #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 55 56 #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 57 58 + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_HELIX diff --git a/miryoku/mapping/66/breeze.h b/miryoku/mapping/66/breeze.h index ba66236..09b9190 100644 --- a/miryoku/mapping/66/breeze.h +++ b/miryoku/mapping/66/breeze.h @@ -1,9 +1,11 @@ // Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_BREEZE) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_BREEZE( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -14,3 +16,7 @@ XXX K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 XXX XXX XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX XXX \ XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX XXX XXX XXX \ XXX K32 K33 K34 K35 K36 K37 XXX + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_BREEZE diff --git a/miryoku/mapping/66/pinkiesout.h b/miryoku/mapping/66/pinkiesout.h index 85435c7..43f7c17 100644 --- a/miryoku/mapping/66/pinkiesout.h +++ b/miryoku/mapping/66/pinkiesout.h @@ -1,9 +1,11 @@ // Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_PINKIESOUT) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_PINKIESOUT( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -14,3 +16,7 @@ XXX K00 K01 K02 K03 K04 XXX XXX K05 K06 K07 K08 K09 XXX \ XXX K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 XXX \ XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \ XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_PINKIESOUT diff --git a/miryoku/mapping/70/ergodash.h b/miryoku/mapping/70/ergodash.h index 1fb4cd4..1ad5264 100644 --- a/miryoku/mapping/70/ergodash.h +++ b/miryoku/mapping/70/ergodash.h @@ -1,9 +1,11 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_ERGODASH) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_ERGODASH( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -14,3 +16,7 @@ XXX K00 K01 K02 K03 K04 XXX XXX K05 K06 K07 K08 K09 XXX K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 XXX \ XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \ XXX XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX XXX + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_ERGODASH diff --git a/miryoku/mapping/70/viterbi.h b/miryoku/mapping/70/viterbi.h index 244e1db..520fb13 100644 --- a/miryoku/mapping/70/viterbi.h +++ b/miryoku/mapping/70/viterbi.h @@ -1,10 +1,12 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_VITERBI) + #define XXX &none #if defined MIRYOKU_MAPPING_PINKIE_STAGGER -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_VITERBI( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -16,7 +18,7 @@ XXX K00 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K09 XXX \ XXX K10 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K19 XXX \ XXX K20 XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX K29 XXX #else -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_VITERBI( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -28,3 +30,7 @@ XXX K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 XXX \ XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \ XXX XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX XXX #endif + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_VITERBI diff --git a/miryoku/mapping/70/zodiark.h b/miryoku/mapping/70/zodiark.h index 57e82ec..d5e8261 100644 --- a/miryoku/mapping/70/zodiark.h +++ b/miryoku/mapping/70/zodiark.h @@ -1,9 +1,11 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_ZODIARK) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_ZODIARK( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -14,3 +16,7 @@ XXX K00 K01 K02 K03 K04 XXX XXX K05 K06 K07 K08 K09 XXX K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 XXX \ XXX K20 K21 K22 K23 K24 XXX XXX XXX XXX K25 K26 K27 K28 K29 XXX \ XXX XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX XXX + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_ZODIARK diff --git a/miryoku/mapping/80/glove80.h b/miryoku/mapping/80/glove80.h index b629162..66d4bd0 100644 --- a/miryoku/mapping/80/glove80.h +++ b/miryoku/mapping/80/glove80.h @@ -1,9 +1,11 @@ // Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_GLOVE80) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_GLOVE80( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -15,3 +17,7 @@ XXX K00 K01 K02 K03 K04 K05 K06 K07 XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \ XXX K20 K21 K22 K23 K24 XXX XXX XXX XXX XXX XXX K25 K26 K27 K28 K29 XXX \ XXX XXX XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX XXX XXX + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_GLOVE80 diff --git a/miryoku/mapping/82/adv360.h b/miryoku/mapping/82/adv360.h index 9787fb2..f1932bf 100644 --- a/miryoku/mapping/82/adv360.h +++ b/miryoku/mapping/82/adv360.h @@ -1,9 +1,11 @@ // Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku +#if !defined (MIRYOKU_LAYOUTMAPPING_ADV360) + #define XXX &none -#define MIRYOKU_MAPPING( \ +#define MIRYOKU_LAYOUTMAPPING_ADV360( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ @@ -14,3 +16,7 @@ XXX K00 K01 K02 K03 K04 XXX XXX K10 K11 K12 K13 K14 XXX XXX XXX XXX XXX XXX K15 K16 K17 K18 K19 XXX \ XXX K20 K21 K22 K23 K24 XXX XXX XXX XXX XXX XXX XXX XXX K25 K26 K27 K28 K29 XXX \ XXX XXX XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX XXX XXX + +#endif + +#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_ADV360