diff --git a/configs/ASiLVLABC/BoardConfig.h b/configs/ASiLVLABC/BoardConfig.h index 9d632dc135..16ec1acefa 100644 --- a/configs/ASiLVLABC/BoardConfig.h +++ b/configs/ASiLVLABC/BoardConfig.h @@ -135,7 +135,7 @@ #define BUTTON_LAYOUT_RIGHT BUTTON_LAYOUT_BOARD_DEFINED_B -// LVL Action Buttons +#define DEFAULT_BOARD_LAYOUT_B_NAME "ASi LVL ABC Default" #define DEFAULT_BOARD_LAYOUT_B {\ {GP_ELEMENT_PIN_BUTTON, {104, 10, 109, 15, 1, 1, 20, GP_SHAPE_SQUARE}},\ {GP_ELEMENT_PIN_BUTTON, {112, 10, 117, 15, 1, 1, 16, GP_SHAPE_SQUARE}},\ @@ -153,7 +153,7 @@ {GP_ELEMENT_PIN_BUTTON, {50, 57, 6, 6, 1, 1, 2, GP_SHAPE_ELLIPSE}}\ } -// LVL ABC +#define DEFAULT_BOARD_LAYOUT_A_NAME "ASi LVL ABC Default" #define DEFAULT_BOARD_LAYOUT_A {\ {GP_ELEMENT_PIN_BUTTON, {20, 30, 5, 5, 1, 1, 5, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {33, 30, 5, 5, 1, 1, 3, GP_SHAPE_ELLIPSE}},\ diff --git a/configs/ASiLVLWASD/BoardConfig.h b/configs/ASiLVLWASD/BoardConfig.h index 28713e1df7..9fa9c7dab2 100644 --- a/configs/ASiLVLWASD/BoardConfig.h +++ b/configs/ASiLVLWASD/BoardConfig.h @@ -135,14 +135,15 @@ #define BUTTON_LAYOUT_RIGHT BUTTON_LAYOUT_BOARD_DEFINED_B // LVL WASD - #define DEFAULT_BOARD_LAYOUT_A {\ +#define DEFAULT_BOARD_LAYOUT_A_NAME "ASi LVL WASD Default" +#define DEFAULT_BOARD_LAYOUT_A {\ {GP_ELEMENT_PIN_BUTTON, {19, 26, 26, 33, 1, 1, 5, GP_SHAPE_SQUARE, 22}},\ {GP_ELEMENT_PIN_BUTTON, {27, 30, 34, 37, 1, 1, 3, GP_SHAPE_SQUARE, 22}},\ {GP_ELEMENT_PIN_BUTTON, {35, 34, 42, 41, 1, 1, 4, GP_SHAPE_SQUARE, 22}},\ {GP_ELEMENT_PIN_BUTTON, {27, 22, 42, 29, 1, 1, 18, GP_SHAPE_SQUARE, 22}}\ } -// LVL Action Buttons +#define DEFAULT_BOARD_LAYOUT_B_NAME "ASi LVL WASD Default" #define DEFAULT_BOARD_LAYOUT_B {\ {GP_ELEMENT_PIN_BUTTON, {104, 10, 109, 15, 1, 1, 20, GP_SHAPE_SQUARE}},\ {GP_ELEMENT_PIN_BUTTON, {112, 10, 117, 15, 1, 1, 16, GP_SHAPE_SQUARE}},\ diff --git a/configs/BentoBox/BoardConfig.h b/configs/BentoBox/BoardConfig.h index 2afa7fceb6..34fc7fd502 100644 --- a/configs/BentoBox/BoardConfig.h +++ b/configs/BentoBox/BoardConfig.h @@ -91,6 +91,7 @@ #define SPLASH_MODE SPLASH_MODE_STATIC #define SPLASH_DURATION 3000 +#define DEFAULT_BOARD_LAYOUT_A_NAME "BentoBox Default" #define DEFAULT_BOARD_LAYOUT_A {\ {GP_ELEMENT_PIN_BUTTON, {12, 25, 7, 7, 1, 1, 13, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {28, 25, 7, 7, 1, 1, 12, GP_SHAPE_ELLIPSE}},\ @@ -104,6 +105,7 @@ {GP_ELEMENT_PIN_BUTTON, {47, 12, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}}\ } +#define DEFAULT_BOARD_LAYOUT_B_NAME "BentoBox Default" #define DEFAULT_BOARD_LAYOUT_B {\ {GP_ELEMENT_PIN_BUTTON, {56, 25, 7, 7, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {72, 22, 7, 7, 1, 1, 9, GP_SHAPE_ELLIPSE}},\ diff --git a/configs/Haute42COSMOX/BoardConfig.h b/configs/Haute42COSMOX/BoardConfig.h index 83aed0d08a..f1a1356258 100644 --- a/configs/Haute42COSMOX/BoardConfig.h +++ b/configs/Haute42COSMOX/BoardConfig.h @@ -109,14 +109,14 @@ #define BUTTON_LAYOUT BUTTON_LAYOUT_BOARD_DEFINED_A #define BUTTON_LAYOUT_RIGHT BUTTON_LAYOUT_BOARD_DEFINED_B - // Stickless + #define DEFAULT_BOARD_LAYOUT_A_NAME "Haute42|COSMOX Default" #define DEFAULT_BOARD_LAYOUT_A {\ {GP_ELEMENT_PIN_BUTTON, {8, 20, 8, 8, 1, 1, 5, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {26, 20, 8, 8, 1, 1, 3, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {41, 29, 8, 8, 1, 1, 4, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {48, 53, 8, 8, 1, 1, 2, GP_SHAPE_ELLIPSE}}\ } - + #define DEFAULT_BOARD_LAYOUT_B_NAME "Haute42|COSMOX Default" #define DEFAULT_BOARD_LAYOUT_B {\ {GP_ELEMENT_PIN_BUTTON, {57, 20, 8, 8, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {75, 16, 8, 8, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ @@ -127,9 +127,7 @@ {GP_ELEMENT_PIN_BUTTON, {93, 34, 8, 8, 1, 1, 8, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {111, 38, 8, 8, 1, 1, 9, GP_SHAPE_ELLIPSE}}\ } - -// Stickless 13 1 -// G13, S13 +#define DEFAULT_BOARD_LAYOUT_A_ALT0_NAME "Haute42|COSMOX G13/S13" #define DEFAULT_BOARD_LAYOUT_A_ALT0 {\ {GP_ELEMENT_PIN_BUTTON, {39, 15, 6, 6, 1, 1, 27, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {18, 27, 6, 6, 1, 1, 5, GP_SHAPE_ELLIPSE}},\ @@ -143,6 +141,7 @@ {GP_ELEMENT_PIN_BUTTON, {93, 13, 2, 2, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {100, 13, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}}\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT0_NAME "Haute42|COSMOX G13/S13" #define DEFAULT_BOARD_LAYOUT_B_ALT0 {\ {GP_ELEMENT_PIN_BUTTON, {56, 27, 6, 6, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {70, 24, 6, 6, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ @@ -153,9 +152,7 @@ {GP_ELEMENT_PIN_BUTTON, {84, 38, 6, 6, 1, 1, 8, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {98, 41, 6, 6, 1, 1, 9, GP_SHAPE_ELLIPSE}}\ } - -// Stickless 13 2 -// T13, M13, M13+ +#define DEFAULT_BOARD_LAYOUT_A_ALT1_NAME "Haute42|COSMOX T13/M13/M13+" #define DEFAULT_BOARD_LAYOUT_A_ALT1 {\ {GP_ELEMENT_PIN_BUTTON, {39, 15, 6, 6, 1, 1, 27, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {18, 27, 6, 6, 1, 1, 5, GP_SHAPE_ELLIPSE}},\ @@ -169,6 +166,7 @@ {GP_ELEMENT_PIN_BUTTON, {93, 13, 2, 2, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {100, 13, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}}\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT1_NAME "Haute42|COSMOX T13/M13/M13+" #define DEFAULT_BOARD_LAYOUT_B_ALT1 {\ {GP_ELEMENT_PIN_BUTTON, {56, 27, 6, 6, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {70, 24, 6, 6, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ @@ -179,9 +177,7 @@ {GP_ELEMENT_PIN_BUTTON, {84, 38, 6, 6, 1, 1, 8, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {98, 41, 6, 6, 1, 1, 9, GP_SHAPE_ELLIPSE}}\ } - -// Stickless 16 1 -// G16, S16 +#define DEFAULT_BOARD_LAYOUT_A_ALT2_NAME "Haute42|COSMOX G16/S16" #define DEFAULT_BOARD_LAYOUT_A_ALT2 {\ {GP_ELEMENT_PIN_BUTTON, {47, 19, 4, 4, 1, 1, 27, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {32, 27, 4, 4, 1, 1, 5, GP_SHAPE_ELLIPSE}},\ @@ -196,7 +192,7 @@ {GP_ELEMENT_PIN_BUTTON, {91, 15, 2, 2, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {98, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}}\ } - +#define DEFAULT_BOARD_LAYOUT_B_ALT2_NAME "Haute42|COSMOX G16/S16" #define DEFAULT_BOARD_LAYOUT_B_ALT2 {\ {GP_ELEMENT_PIN_BUTTON, {59, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {69, 25, 4, 4, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ @@ -207,9 +203,7 @@ {GP_ELEMENT_PIN_BUTTON, {79, 35, 4, 4, 1, 1, 8, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {89, 37, 4, 4, 1, 1, 9, GP_SHAPE_ELLIPSE}}\ } - -// Stickless 16 2 -// T16, M16, M16+ +#define DEFAULT_BOARD_LAYOUT_A_ALT3_NAME "Haute42|COSMOX T16/M16/M16+" #define DEFAULT_BOARD_LAYOUT_A_ALT3 {\ {GP_ELEMENT_PIN_BUTTON, {47, 19, 4, 4, 1, 1, 27, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {32, 27, 4, 4, 1, 1, 5, GP_SHAPE_ELLIPSE}},\ @@ -224,6 +218,7 @@ {GP_ELEMENT_PIN_BUTTON, {91, 15, 2, 2, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {98, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}}\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT3_NAME "Haute42|COSMOX T16/M16/M16+" #define DEFAULT_BOARD_LAYOUT_B_ALT3 {\ {GP_ELEMENT_PIN_BUTTON, {59, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ @@ -235,8 +230,7 @@ {GP_ELEMENT_PIN_BUTTON, {79, 35, 4, 4, 1, 1, 8, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {89, 37, 4, 4, 1, 1, 9, GP_SHAPE_ELLIPSE}}\ } - -// Stickless 16 R +#define DEFAULT_BOARD_LAYOUT_A_ALT4_NAME "Haute42|COSMOX R16" #define DEFAULT_BOARD_LAYOUT_A_ALT4 {\ {GP_ELEMENT_PIN_BUTTON, {47, 19, 4, 4, 1, 1, 27, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {32, 27, 4, 4, 1, 1, 5, GP_SHAPE_ELLIPSE}},\ @@ -251,6 +245,7 @@ {GP_ELEMENT_PIN_BUTTON, {91, 15, 2, 2, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {98, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}}\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT4_NAME "Haute42|COSMOX R16" #define DEFAULT_BOARD_LAYOUT_B_ALT4 {\ {GP_ELEMENT_PIN_BUTTON, {59, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ @@ -262,9 +257,7 @@ {GP_ELEMENT_PIN_BUTTON, {79, 35, 4, 4, 1, 1, 8, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {89, 37, 4, 4, 1, 1, 9, GP_SHAPE_ELLIPSE}}\ } - -// Stickless 16 Southpaw -// E16 +#define DEFAULT_BOARD_LAYOUT_A_ALT5_NAME "Haute42|COSMOX E16" #define DEFAULT_BOARD_LAYOUT_A_ALT5 {\ {GP_ELEMENT_PIN_BUTTON, {84, 17, 4, 4, 1, 1, 27, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {96, 27, 4, 4, 1, 1, 4, GP_SHAPE_ELLIPSE}},\ @@ -280,6 +273,7 @@ {GP_ELEMENT_PIN_BUTTON, {36, 15, 2, 2, 1, 1, 21, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {30, 15, 2, 2, 1, 1, 14, GP_SHAPE_ELLIPSE}}\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT5_NAME "Haute42|COSMOX E16" #define DEFAULT_BOARD_LAYOUT_B_ALT5 {\ {GP_ELEMENT_PIN_BUTTON, {69, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ @@ -291,7 +285,6 @@ {GP_ELEMENT_PIN_BUTTON, {49, 35, 4, 4, 1, 1, 8, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {39, 37, 4, 4, 1, 1, 9, GP_SHAPE_ELLIPSE}}\ } - // Keyboard Host enabled by default #define KEYBOARD_HOST_ENABLED 1 diff --git a/configs/Haute42COSMOXCAS/BoardConfig.h b/configs/Haute42COSMOXCAS/BoardConfig.h index 586e4c465a..ceafd26f40 100644 --- a/configs/Haute42COSMOXCAS/BoardConfig.h +++ b/configs/Haute42COSMOXCAS/BoardConfig.h @@ -133,6 +133,7 @@ #define SPLASH_MODE SPLASH_MODE_STATIC #define SPLASH_DURATION 3000 +#define DEFAULT_BOARD_LAYOUT_A_NAME "Haute42 COSMOX C-AS Default" #define DEFAULT_BOARD_LAYOUT_A {\ {GP_ELEMENT_PIN_BUTTON, {52, 50, 5, 5, 1, 1, 18, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {87, 10, 91, 14, 1, 1, 17, GP_SHAPE_SQUARE}},\ @@ -142,6 +143,7 @@ {GP_ELEMENT_LEVER, {36, 28, 10, 10, 1, 1, 0, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_NAME "Haute42 COSMOX C-AS Default" #define DEFAULT_BOARD_LAYOUT_B {\ {GP_ELEMENT_PIN_BUTTON, {71, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {81, 25, 4, 4, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ @@ -156,6 +158,7 @@ } // Haute42|COSMOX C-AS with both analog modules +#define DEFAULT_BOARD_LAYOUT_A_ALT0_NAME "Haute42|COSMOX C-AS with both analog modules" #define DEFAULT_BOARD_LAYOUT_A_ALT0 {\ {GP_ELEMENT_LEVER, {52, 50, 5, 5, 1, 0, GP_LEVER_MODE_LEFT_ANALOG}},\ {GP_ELEMENT_PIN_BUTTON, {87, 10, 91, 14, 1, 1, 17, GP_SHAPE_SQUARE}},\ @@ -164,7 +167,7 @@ {GP_ELEMENT_PIN_BUTTON, {108, 10, 112, 14, 1, 1, 14, GP_SHAPE_SQUARE}},\ {GP_ELEMENT_LEVER, {36, 28, 10, 10, 1, 1, 0, GP_SHAPE_ELLIPSE}},\ } - +#define DEFAULT_BOARD_LAYOUT_B_ALT0_NAME "Haute42|COSMOX C-AS with both analog modules" #define DEFAULT_BOARD_LAYOUT_B_ALT0 {\ {GP_ELEMENT_PIN_BUTTON, {71, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {81, 25, 4, 4, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ @@ -177,8 +180,8 @@ {GP_ELEMENT_LEVER, {65, 50, 5, 5, 1, 0, GP_LEVER_MODE_RIGHT_ANALOG}},\ {GP_ELEMENT_PIN_BUTTON, {72, 17, 4, 4, 1, 1, 15, GP_SHAPE_ELLIPSE}},\ } - // Haute42|COSMOX C-AS with only left analog module as LS +#define DEFAULT_BOARD_LAYOUT_A_ALT1_NAME "Haute42|COSMOX C-AS with only left analog module as LS" #define DEFAULT_BOARD_LAYOUT_A_ALT1 {\ {GP_ELEMENT_LEVER, {52, 50, 5, 5, 1, 0, GP_LEVER_MODE_LEFT_ANALOG}},\ {GP_ELEMENT_PIN_BUTTON, {87, 10, 91, 14, 1, 1, 17, GP_SHAPE_SQUARE}},\ @@ -187,7 +190,7 @@ {GP_ELEMENT_PIN_BUTTON, {108, 10, 112, 14, 1, 1, 14, GP_SHAPE_SQUARE}},\ {GP_ELEMENT_LEVER, {36, 28, 10, 10, 1, 1, 0, GP_SHAPE_ELLIPSE}},\ } - +#define DEFAULT_BOARD_LAYOUT_B_ALT1_NAME "Haute42|COSMOX C-AS with only left analog module as LS" #define DEFAULT_BOARD_LAYOUT_B_ALT1 {\ {GP_ELEMENT_PIN_BUTTON, {71, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {81, 25, 4, 4, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ @@ -200,8 +203,8 @@ {GP_ELEMENT_PIN_BUTTON, {65, 50, 5, 5, 1, 1, 19, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {72, 17, 4, 4, 1, 1, 15, GP_SHAPE_ELLIPSE}},\ } - // Haute42|COSMOX C-AS with only right analog module as RS +#define DEFAULT_BOARD_LAYOUT_A_ALT2_NAME "Haute42|COSMOX C-AS with only left analog module as RS" #define DEFAULT_BOARD_LAYOUT_A_ALT2 {\ {GP_ELEMENT_PIN_BUTTON, {52, 50, 5, 5, 1, 1, 18, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {87, 10, 91, 14, 1, 1, 17, GP_SHAPE_SQUARE}},\ @@ -210,7 +213,7 @@ {GP_ELEMENT_PIN_BUTTON, {108, 10, 112, 14, 1, 1, 14, GP_SHAPE_SQUARE}},\ {GP_ELEMENT_LEVER, {36, 28, 10, 10, 1, 1, 0, GP_SHAPE_ELLIPSE}},\ } - +#define DEFAULT_BOARD_LAYOUT_B_ALT2_NAME "Haute42|COSMOX C-AS with only left analog module as RS" #define DEFAULT_BOARD_LAYOUT_B_ALT2 {\ {GP_ELEMENT_PIN_BUTTON, {71, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {81, 25, 4, 4, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ @@ -223,8 +226,8 @@ {GP_ELEMENT_LEVER, {65, 50, 5, 5, 1, 0, GP_LEVER_MODE_RIGHT_ANALOG}},\ {GP_ELEMENT_PIN_BUTTON, {72, 17, 4, 4, 1, 1, 15, GP_SHAPE_ELLIPSE}},\ } - // Haute42|COSMOX C-AS with only left analog module as RS +#define DEFAULT_BOARD_LAYOUT_A_ALT3_NAME "Haute42|COSMOX C-AS with only right analog module as LS" #define DEFAULT_BOARD_LAYOUT_A_ALT3 {\ {GP_ELEMENT_LEVER, {52, 50, 5, 5, 1, 0, GP_LEVER_MODE_RIGHT_ANALOG}},\ {GP_ELEMENT_PIN_BUTTON, {87, 10, 91, 14, 1, 1, 17, GP_SHAPE_SQUARE}},\ @@ -233,7 +236,7 @@ {GP_ELEMENT_PIN_BUTTON, {108, 10, 112, 14, 1, 1, 14, GP_SHAPE_SQUARE}},\ {GP_ELEMENT_LEVER, {36, 28, 10, 10, 1, 1, 0, GP_SHAPE_ELLIPSE}},\ } - +#define DEFAULT_BOARD_LAYOUT_B_ALT3_NAME "Haute42|COSMOX C-AS with only right analog module as LS" #define DEFAULT_BOARD_LAYOUT_B_ALT3 {\ {GP_ELEMENT_PIN_BUTTON, {71, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {81, 25, 4, 4, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ @@ -246,8 +249,8 @@ {GP_ELEMENT_PIN_BUTTON, {65, 50, 5, 5, 1, 1, 19, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {72, 17, 4, 4, 1, 1, 15, GP_SHAPE_ELLIPSE}},\ } - // Haute42|COSMOX C-AS with only right analog module as LS +#define DEFAULT_BOARD_LAYOUT_A_ALT4_NAME "Haute42|COSMOX C-AS with only right analog module as RS" #define DEFAULT_BOARD_LAYOUT_A_ALT4 {\ {GP_ELEMENT_PIN_BUTTON, {52, 50, 5, 5, 1, 1, 18, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {87, 10, 91, 14, 1, 1, 17, GP_SHAPE_SQUARE}},\ @@ -256,7 +259,7 @@ {GP_ELEMENT_PIN_BUTTON, {108, 10, 112, 14, 1, 1, 14, GP_SHAPE_SQUARE}},\ {GP_ELEMENT_LEVER, {36, 28, 10, 10, 1, 1, 0, GP_SHAPE_ELLIPSE}},\ } - +#define DEFAULT_BOARD_LAYOUT_B_ALT4_NAME "Haute42|COSMOX C-AS with only right analog module as RS" #define DEFAULT_BOARD_LAYOUT_B_ALT4 {\ {GP_ELEMENT_PIN_BUTTON, {71, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {81, 25, 4, 4, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ @@ -269,7 +272,6 @@ {GP_ELEMENT_LEVER, {65, 50, 5, 5, 1, 0, GP_LEVER_MODE_LEFT_ANALOG}},\ {GP_ELEMENT_PIN_BUTTON, {72, 17, 4, 4, 1, 1, 15, GP_SHAPE_ELLIPSE}},\ } - // Keyboard Host enabled by default #define KEYBOARD_HOST_ENABLED 1 diff --git a/configs/Haute42COSMOXCAT/BoardConfig.h b/configs/Haute42COSMOXCAT/BoardConfig.h index 74640c9e61..fa3989116e 100644 --- a/configs/Haute42COSMOXCAT/BoardConfig.h +++ b/configs/Haute42COSMOXCAT/BoardConfig.h @@ -120,6 +120,7 @@ #define SPLASH_MODE SPLASH_MODE_STATIC #define SPLASH_DURATION 3000 +#define DEFAULT_BOARD_LAYOUT_A_NAME "Haute42 COSMOX C-AT Default" #define DEFAULT_BOARD_LAYOUT_A {\ {GP_ELEMENT_PIN_BUTTON, {43, 17, 4, 4, 1, 1, 29, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {31, 27, 4, 4, 1, 1, 5, GP_SHAPE_ELLIPSE}},\ @@ -135,6 +136,7 @@ {GP_ELEMENT_PIN_BUTTON, {108, 10, 112, 14, 1, 1, 14, GP_SHAPE_SQUARE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_NAME "Haute42 COSMOX C-AT Default" #define DEFAULT_BOARD_LAYOUT_B {\ {GP_ELEMENT_PIN_BUTTON, {71, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {81, 25, 4, 4, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ diff --git a/configs/Haute42COSMOXMLite/BoardConfig.h b/configs/Haute42COSMOXMLite/BoardConfig.h index 7a1b0c1b1c..bc6157c4f4 100644 --- a/configs/Haute42COSMOXMLite/BoardConfig.h +++ b/configs/Haute42COSMOXMLite/BoardConfig.h @@ -114,6 +114,7 @@ #define SPLASH_MODE SPLASH_MODE_STATIC #define SPLASH_DURATION 3000 +#define DEFAULT_BOARD_LAYOUT_A_NAME "Haute42 COSMOX M Ultra Default" #define DEFAULT_BOARD_LAYOUT_A {\ {GP_ELEMENT_PIN_BUTTON, {47, 19, 4, 4, 1, 1, 27, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {32, 27, 4, 4, 1, 1, 5, GP_SHAPE_ELLIPSE}},\ @@ -129,6 +130,7 @@ {GP_ELEMENT_PIN_BUTTON, {105, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}}\ } +#define DEFAULT_BOARD_LAYOUT_B_NAME "Haute42 COSMOX M Ultra Default" #define DEFAULT_BOARD_LAYOUT_B {\ {GP_ELEMENT_PIN_BUTTON, {59, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {69, 25, 4, 4, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ diff --git a/configs/Haute42COSMOXMUltra/BoardConfig.h b/configs/Haute42COSMOXMUltra/BoardConfig.h index 9896e998c5..b5089652eb 100644 --- a/configs/Haute42COSMOXMUltra/BoardConfig.h +++ b/configs/Haute42COSMOXMUltra/BoardConfig.h @@ -114,6 +114,7 @@ #define SPLASH_MODE SPLASH_MODE_STATIC #define SPLASH_DURATION 3000 +#define DEFAULT_BOARD_LAYOUT_A_NAME "Haute42 COSMOX M Ultra Default" #define DEFAULT_BOARD_LAYOUT_A {\ {GP_ELEMENT_PIN_BUTTON, {47, 19, 4, 4, 1, 1, 27, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {32, 27, 4, 4, 1, 1, 5, GP_SHAPE_ELLIPSE}},\ @@ -129,6 +130,7 @@ {GP_ELEMENT_PIN_BUTTON, {105, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}}\ } +#define DEFAULT_BOARD_LAYOUT_B_NAME "Haute42 COSMOX M Ultra Default" #define DEFAULT_BOARD_LAYOUT_B {\ {GP_ELEMENT_PIN_BUTTON, {59, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {69, 25, 4, 4, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ @@ -142,6 +144,7 @@ } // C16 +#define DEFAULT_BOARD_LAYOUT_A_ALT0_NAME "Haute42|COSMOX X-Move Series Standard" #define DEFAULT_BOARD_LAYOUT_A_ALT0 {\ {GP_ELEMENT_PIN_BUTTON, {47, 19, 4, 4, 1, 1, 27, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {32, 27, 4, 4, 1, 1, 5, GP_SHAPE_ELLIPSE}},\ @@ -157,6 +160,7 @@ {GP_ELEMENT_PIN_BUTTON, {105, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}}\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT0_NAME "Haute42|COSMOX X-Move Series Standard" #define DEFAULT_BOARD_LAYOUT_B_ALT0 {\ {GP_ELEMENT_PIN_BUTTON, {59, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {69, 25, 4, 4, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ @@ -170,6 +174,7 @@ } // C16-S +#define DEFAULT_BOARD_LAYOUT_A_ALT1_NAME "Haute42|COSMOX X-Move Series + WASD" #define DEFAULT_BOARD_LAYOUT_A_ALT1 {\ {GP_ELEMENT_PIN_BUTTON, {19, 30, 20, 24, 1, 1, 18, GP_SHAPE_PILL,120}},\ {GP_ELEMENT_PIN_BUTTON, {32, 25, 4, 4, 1, 1, 5, GP_SHAPE_ELLIPSE}},\ @@ -179,6 +184,7 @@ {GP_ELEMENT_PIN_BUTTON, {55, 53, 56, 47, 1, 1, 2, GP_SHAPE_PILL,120}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT1_NAME "Haute42|COSMOX X-Move Series + WASD" #define DEFAULT_BOARD_LAYOUT_B_ALT1 {\ {GP_ELEMENT_PIN_BUTTON, {74, 25, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {83, 20, 4, 4, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ @@ -193,6 +199,7 @@ } // M Ultra Gen 2 +#define DEFAULT_BOARD_LAYOUT_A_ALT2_NAME "Haute42|COSMOX X-Move Series + Joystick" #define DEFAULT_BOARD_LAYOUT_A_ALT2 {\ {GP_ELEMENT_PIN_BUTTON, {51, 19, 4, 4, 1, 1, 27, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {36, 27, 4, 4, 1, 1, 5, GP_SHAPE_ELLIPSE}},\ @@ -208,6 +215,7 @@ {GP_ELEMENT_PIN_BUTTON, {105, 15, 2, 2, 1, 1, 14, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT2_NAME "Haute42|COSMOX X-Move Series + Joystick" #define DEFAULT_BOARD_LAYOUT_B_ALT2 {\ {GP_ELEMENT_PIN_BUTTON, {63, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {73, 25, 4, 4, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ @@ -221,6 +229,7 @@ } // Haute42|COSMOX X-Move Series Standard +#define DEFAULT_BOARD_LAYOUT_A_ALT3_NAME "M Ultra Gen 2" #define DEFAULT_BOARD_LAYOUT_A_ALT3 {\ {GP_ELEMENT_PIN_BUTTON, {37, 19, 4, 4, 1, 1, 2, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {23, 24, 4, 4, 1, 1, 5, GP_SHAPE_ELLIPSE}},\ @@ -235,6 +244,7 @@ {GP_ELEMENT_PIN_BUTTON, {103, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT3_NAME "M Ultra Gen 2" #define DEFAULT_BOARD_LAYOUT_B_ALT3 {\ {GP_ELEMENT_PIN_BUTTON, {64, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {74, 25, 4, 4, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ @@ -248,6 +258,7 @@ } // Haute42|COSMOX X-Move Series + WASD +#define DEFAULT_BOARD_LAYOUT_A_ALT4_NAME "C16" #define DEFAULT_BOARD_LAYOUT_A_ALT4 {\ {GP_ELEMENT_PIN_BUTTON, {20, 21, 27, 28, 1, 1, 5, GP_SHAPE_SQUARE,22}},\ {GP_ELEMENT_PIN_BUTTON, {28, 25, 35, 32, 1, 1, 3, GP_SHAPE_SQUARE,22}},\ @@ -262,6 +273,7 @@ {GP_ELEMENT_PIN_BUTTON, {103, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT4_NAME "C16" #define DEFAULT_BOARD_LAYOUT_B_ALT4 {\ {GP_ELEMENT_PIN_BUTTON, {64, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {74, 25, 4, 4, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ @@ -275,6 +287,7 @@ } // Haute42|COSMOX X-Move Series + Joystick +#define DEFAULT_BOARD_LAYOUT_A_ALT5_NAME "C16-S" #define DEFAULT_BOARD_LAYOUT_A_ALT5 {\ {GP_ELEMENT_LEVER, {28, 28, 7, 7, 1, 0, 0}},\ {GP_ELEMENT_PIN_BUTTON, {68, 15, 2, 2, 1, 1, 14, GP_SHAPE_ELLIPSE}},\ @@ -286,6 +299,7 @@ {GP_ELEMENT_PIN_BUTTON, {103, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT5_NAME "C16-S" #define DEFAULT_BOARD_LAYOUT_B_ALT5 {\ {GP_ELEMENT_PIN_BUTTON, {64, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {74, 25, 4, 4, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ diff --git a/configs/Haute42COSMOXXAnalog/BoardConfig.h b/configs/Haute42COSMOXXAnalog/BoardConfig.h index 5b1a645fea..122177f4b9 100644 --- a/configs/Haute42COSMOXXAnalog/BoardConfig.h +++ b/configs/Haute42COSMOXXAnalog/BoardConfig.h @@ -127,7 +127,7 @@ #define BUTTON_LAYOUT BUTTON_LAYOUT_BOARD_DEFINED_A #define BUTTON_LAYOUT_RIGHT BUTTON_LAYOUT_BOARD_DEFINED_B -// Haute42|COSMOX X Series Analog +#define DEFAULT_BOARD_LAYOUT_A_NAME "Haute42|COSMOX X Series Analog" #define DEFAULT_BOARD_LAYOUT_A {\ {GP_ELEMENT_PIN_BUTTON, {42, 19, 4, 4, 1, 1, 2, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {27, 27, 4, 4, 1, 1, 5, GP_SHAPE_ELLIPSE}},\ @@ -138,9 +138,10 @@ {GP_ELEMENT_PIN_BUTTON, {82, 15, 2, 2, 1, 1, 20, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {89, 15, 2, 2, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {96, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}},\ - {GP_ELEMENT_LEVER, {40, 50, 5, 5, 1, 0, GP_LEVER_MODE_LEFT_ANALOG}}\ + {GP_ELEMENT_LEVER, {40, 50, 5, 5, 1, 0, GP_LEVER_MODE_LEFT_ANALOG}},\ } +#define DEFAULT_BOARD_LAYOUT_B_NAME "Haute42|COSMOX X Series Analog" #define DEFAULT_BOARD_LAYOUT_B {\ {GP_ELEMENT_PIN_BUTTON, {69, 17, 4, 4, 1, 1, 15, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {64, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ @@ -151,10 +152,11 @@ {GP_ELEMENT_PIN_BUTTON, {74, 35, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {84, 35, 4, 4, 1, 1, 8, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {94, 36, 4, 4, 1, 1, 9, GP_SHAPE_ELLIPSE}},\ - {GP_ELEMENT_LEVER, {64, 50, 5, 5, 1, 0, GP_LEVER_MODE_RIGHT_ANALOG}}\ + {GP_ELEMENT_LEVER, {64, 50, 5, 5, 1, 0, GP_LEVER_MODE_RIGHT_ANALOG}},\ } // Haute42|COSMOX X Series Analog + WASD +#define DEFAULT_BOARD_LAYOUT_A_ALT0_NAME "Haute42|COSMOX X Series Standard" #define DEFAULT_BOARD_LAYOUT_A_ALT0 {\ {GP_ELEMENT_PIN_BUTTON, {24, 24, 31, 31, 1, 1, 5, GP_SHAPE_SQUARE, 22}},\ {GP_ELEMENT_PIN_BUTTON, {32, 28, 39, 35, 1, 1, 3, GP_SHAPE_SQUARE, 22}},\ @@ -165,9 +167,10 @@ {GP_ELEMENT_PIN_BUTTON, {82, 15, 2, 2, 1, 1, 20, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {89, 15, 2, 2, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {96, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}},\ - {GP_ELEMENT_LEVER, {40, 50, 5, 5, 1, 0, GP_LEVER_MODE_LEFT_ANALOG}}\ + {GP_ELEMENT_LEVER, {40, 50, 5, 5, 1, 0, GP_LEVER_MODE_LEFT_ANALOG}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT0_NAME "Haute42|COSMOX X Series Standard" #define DEFAULT_BOARD_LAYOUT_B_ALT0 {\ {GP_ELEMENT_PIN_BUTTON, {69, 17, 4, 4, 1, 1, 15, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {64, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ @@ -178,10 +181,11 @@ {GP_ELEMENT_PIN_BUTTON, {74, 35, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {84, 35, 4, 4, 1, 1, 8, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {94, 36, 4, 4, 1, 1, 9, GP_SHAPE_ELLIPSE}},\ - {GP_ELEMENT_LEVER, {64, 50, 5, 5, 1, 0, GP_LEVER_MODE_RIGHT_ANALOG}}\ + {GP_ELEMENT_LEVER, {64, 50, 5, 5, 1, 0, GP_LEVER_MODE_RIGHT_ANALOG}},\ } // Haute42|COSMOX X Series Analog + Joystick +#define DEFAULT_BOARD_LAYOUT_A_ALT1_NAME "Haute42|COSMOX X Series Standard + WASD" #define DEFAULT_BOARD_LAYOUT_A_ALT1 {\ {GP_ELEMENT_LEVER, {36, 30, 7, 7, 1, 0, 0}},\ {GP_ELEMENT_PIN_BUTTON, {25, 15, 2, 2, 1, 1, 14, GP_SHAPE_ELLIPSE}},\ @@ -189,9 +193,10 @@ {GP_ELEMENT_PIN_BUTTON, {82, 15, 2, 2, 1, 1, 20, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {89, 15, 2, 2, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {96, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}},\ - {GP_ELEMENT_LEVER, {40, 50, 5, 5, 1, 0, GP_LEVER_MODE_LEFT_ANALOG}}\ + {GP_ELEMENT_LEVER, {40, 50, 5, 5, 1, 0, GP_LEVER_MODE_LEFT_ANALOG}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT1_NAME "Haute42|COSMOX X Series Standard + WASD" #define DEFAULT_BOARD_LAYOUT_B_ALT1 {\ {GP_ELEMENT_PIN_BUTTON, {69, 17, 4, 4, 1, 1, 15, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {64, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ @@ -202,10 +207,11 @@ {GP_ELEMENT_PIN_BUTTON, {74, 35, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {84, 35, 4, 4, 1, 1, 8, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {94, 36, 4, 4, 1, 1, 9, GP_SHAPE_ELLIPSE}},\ - {GP_ELEMENT_LEVER, {64, 50, 5, 5, 1, 0, GP_LEVER_MODE_RIGHT_ANALOG}}\ + {GP_ELEMENT_LEVER, {64, 50, 5, 5, 1, 0, GP_LEVER_MODE_RIGHT_ANALOG}},\ } // Haute42|COSMOX X Series Standard +#define DEFAULT_BOARD_LAYOUT_A_ALT2_NAME "Haute42|COSMOX X Series Standard + Joystick" #define DEFAULT_BOARD_LAYOUT_A_ALT2 {\ {GP_ELEMENT_PIN_BUTTON, {42, 19, 4, 4, 1, 1, 2, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {27, 27, 4, 4, 1, 1, 5, GP_SHAPE_ELLIPSE}},\ @@ -217,9 +223,10 @@ {GP_ELEMENT_PIN_BUTTON, {89, 15, 2, 2, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {96, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {42, 48, 4, 4, 1, 1, 26, GP_SHAPE_ELLIPSE}},\ - {GP_ELEMENT_PIN_BUTTON, {54, 49, 5, 5, 1, 1, 27, GP_SHAPE_ELLIPSE}}\ + {GP_ELEMENT_PIN_BUTTON, {54, 49, 5, 5, 1, 1, 27, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT2_NAME "Haute42|COSMOX X Series Standard + Joystick" #define DEFAULT_BOARD_LAYOUT_B_ALT2 {\ {GP_ELEMENT_PIN_BUTTON, {69, 17, 4, 4, 1, 1, 15, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {64, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ @@ -230,10 +237,11 @@ {GP_ELEMENT_PIN_BUTTON, {74, 35, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {84, 35, 4, 4, 1, 1, 8, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {94, 36, 4, 4, 1, 1, 9, GP_SHAPE_ELLIPSE}},\ - {GP_ELEMENT_PIN_BUTTON, {66, 48, 4, 4, 1, 1, 19, GP_SHAPE_ELLIPSE}}\ + {GP_ELEMENT_PIN_BUTTON, {66, 48, 4, 4, 1, 1, 19, GP_SHAPE_ELLIPSE}},\ } // Haute42|COSMOX X Series Standard + WASD +#define DEFAULT_BOARD_LAYOUT_A_ALT3_NAME "Haute42|COSMOX X Series Analog + WASD" #define DEFAULT_BOARD_LAYOUT_A_ALT3 {\ {GP_ELEMENT_PIN_BUTTON, {24, 24, 31, 31, 1, 1, 5, GP_SHAPE_SQUARE, 22}},\ {GP_ELEMENT_PIN_BUTTON, {32, 28, 39, 35, 1, 1, 3, GP_SHAPE_SQUARE, 22}},\ @@ -245,9 +253,10 @@ {GP_ELEMENT_PIN_BUTTON, {89, 15, 2, 2, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {96, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {42, 48, 4, 4, 1, 1, 26, GP_SHAPE_ELLIPSE}},\ - {GP_ELEMENT_PIN_BUTTON, {54, 49, 5, 5, 1, 1, 27, GP_SHAPE_ELLIPSE}}\ + {GP_ELEMENT_PIN_BUTTON, {54, 49, 5, 5, 1, 1, 27, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT3_NAME "Haute42|COSMOX X Series Analog + WASD" #define DEFAULT_BOARD_LAYOUT_B_ALT3 {\ {GP_ELEMENT_PIN_BUTTON, {69, 17, 4, 4, 1, 1, 15, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {64, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ @@ -258,10 +267,11 @@ {GP_ELEMENT_PIN_BUTTON, {74, 35, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {84, 35, 4, 4, 1, 1, 8, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {94, 36, 4, 4, 1, 1, 9, GP_SHAPE_ELLIPSE}},\ - {GP_ELEMENT_PIN_BUTTON, {66, 48, 4, 4, 1, 1, 19, GP_SHAPE_ELLIPSE}}\ + {GP_ELEMENT_PIN_BUTTON, {66, 48, 4, 4, 1, 1, 19, GP_SHAPE_ELLIPSE}},\ } // Haute42|COSMOX X Series Standard + Joystick +#define DEFAULT_BOARD_LAYOUT_A_ALT4_NAME "Haute42|COSMOX X Series Analog + Joystick" #define DEFAULT_BOARD_LAYOUT_A_ALT4 {\ {GP_ELEMENT_LEVER, {36, 30, 7, 7, 1, 0, 0}},\ {GP_ELEMENT_PIN_BUTTON, {25, 15, 2, 2, 1, 1, 14, GP_SHAPE_ELLIPSE}},\ @@ -270,9 +280,10 @@ {GP_ELEMENT_PIN_BUTTON, {89, 15, 2, 2, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {96, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {42, 48, 4, 4, 1, 1, 26, GP_SHAPE_ELLIPSE}},\ - {GP_ELEMENT_PIN_BUTTON, {54, 49, 5, 5, 1, 1, 27, GP_SHAPE_ELLIPSE}}\ + {GP_ELEMENT_PIN_BUTTON, {54, 49, 5, 5, 1, 1, 27, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT4_NAME "Haute42|COSMOX X Series Analog + Joystick" #define DEFAULT_BOARD_LAYOUT_B_ALT4 {\ {GP_ELEMENT_PIN_BUTTON, {69, 17, 4, 4, 1, 1, 15, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {64, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ @@ -283,10 +294,11 @@ {GP_ELEMENT_PIN_BUTTON, {74, 35, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {84, 35, 4, 4, 1, 1, 8, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {94, 36, 4, 4, 1, 1, 9, GP_SHAPE_ELLIPSE}},\ - {GP_ELEMENT_PIN_BUTTON, {66, 48, 4, 4, 1, 1, 19, GP_SHAPE_ELLIPSE}}\ + {GP_ELEMENT_PIN_BUTTON, {66, 48, 4, 4, 1, 1, 19, GP_SHAPE_ELLIPSE}},\ } // Haute42|COSMOX X Series Standard - Bottom +#define DEFAULT_BOARD_LAYOUT_A_ALT5_NAME "Haute42|COSMOX X Series Standard - Bottom" #define DEFAULT_BOARD_LAYOUT_A_ALT5 {\ {GP_ELEMENT_PIN_BUTTON, {42, 19, 4, 4, 1, 1, 2, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {27, 27, 4, 4, 1, 1, 5, GP_SHAPE_ELLIPSE}},\ @@ -299,6 +311,7 @@ {GP_ELEMENT_PIN_BUTTON, {96, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT5_NAME "Haute42|COSMOX X Series Standard - Bottom" #define DEFAULT_BOARD_LAYOUT_B_ALT5 {\ {GP_ELEMENT_PIN_BUTTON, {69, 17, 4, 4, 1, 1, 15, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {64, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ @@ -312,6 +325,7 @@ } // Haute42|COSMOX X Series Standard + WASD - Bottom +#define DEFAULT_BOARD_LAYOUT_A_ALT6_NAME "Haute42|COSMOX X Series Standard + WASD - Bottom" #define DEFAULT_BOARD_LAYOUT_A_ALT6 {\ {GP_ELEMENT_PIN_BUTTON, {24, 24, 31, 31, 1, 1, 5, GP_SHAPE_SQUARE, 22}},\ {GP_ELEMENT_PIN_BUTTON, {32, 28, 39, 35, 1, 1, 3, GP_SHAPE_SQUARE, 22}},\ @@ -324,6 +338,7 @@ {GP_ELEMENT_PIN_BUTTON, {96, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT6_NAME "Haute42|COSMOX X Series Standard + WASD - Bottom" #define DEFAULT_BOARD_LAYOUT_B_ALT6 {\ {GP_ELEMENT_PIN_BUTTON, {69, 17, 4, 4, 1, 1, 15, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {64, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ @@ -337,6 +352,7 @@ } // Haute42|COSMOX X Series Standard + Joystick - Bottom +#define DEFAULT_BOARD_LAYOUT_A_ALT7_NAME "Haute42|COSMOX X Series Standard + Joystick - Bottom" #define DEFAULT_BOARD_LAYOUT_A_ALT7 {\ {GP_ELEMENT_LEVER, {36, 30, 7, 7, 1, 0, 0}},\ {GP_ELEMENT_PIN_BUTTON, {25, 15, 2, 2, 1, 1, 14, GP_SHAPE_ELLIPSE}},\ @@ -346,6 +362,7 @@ {GP_ELEMENT_PIN_BUTTON, {96, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT7_NAME "Haute42|COSMOX X Series Standard + Joystick - Bottom" #define DEFAULT_BOARD_LAYOUT_B_ALT7 {\ {GP_ELEMENT_PIN_BUTTON, {69, 17, 4, 4, 1, 1, 15, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {64, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ diff --git a/configs/MavercadeRev2/BoardConfig.h b/configs/MavercadeRev2/BoardConfig.h index f3312a03cb..bcb157638e 100644 --- a/configs/MavercadeRev2/BoardConfig.h +++ b/configs/MavercadeRev2/BoardConfig.h @@ -109,7 +109,7 @@ #define BUTTON_LAYOUT BUTTON_LAYOUT_BOARD_DEFINED_A #define BUTTON_LAYOUT_RIGHT BUTTON_LAYOUT_BOARD_DEFINED_B -// KeebBrawler-04MX +#define DEFAULT_BOARD_LAYOUT_A_NAME "KeebBrawler-04MX" #define DEFAULT_BOARD_LAYOUT_A {\ {GP_ELEMENT_PIN_BUTTON, {5, 20, 12, 36, 1, 1, 6, GP_SHAPE_PILL}},\ {GP_ELEMENT_PIN_BUTTON, {19, 23, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ @@ -119,6 +119,7 @@ {GP_ELEMENT_PIN_BUTTON, {42, 50, 49, 43, 1, 1, 11, GP_SHAPE_PILL, 135}},\ } +#define DEFAULT_BOARD_LAYOUT_B_NAME "KeebBrawler-04MX" #define DEFAULT_BOARD_LAYOUT_B {\ {GP_ELEMENT_PIN_BUTTON, {88, 21, 4, 4, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {99, 19, 4, 4, 1, 1, 14, GP_SHAPE_ELLIPSE}},\ @@ -132,6 +133,7 @@ } // KeebBrawler-03MX +#define DEFAULT_BOARD_LAYOUT_A_ALT0_NAME "KeebBrawler-03MX" #define DEFAULT_BOARD_LAYOUT_A_ALT0 {\ {GP_ELEMENT_PIN_BUTTON, {5, 20, 12, 36, 1, 1, 6, GP_SHAPE_PILL}},\ {GP_ELEMENT_PIN_BUTTON, {19, 23, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ @@ -140,6 +142,7 @@ {GP_ELEMENT_PIN_BUTTON, {31, 50, 38, 43, 1, 1, 19, GP_SHAPE_PILL, 135}},\ {GP_ELEMENT_PIN_BUTTON, {51, 50, 73, 43, 1, 1, 11, GP_SHAPE_PILL}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT0_NAME "KeebBrawler-03MX" #define DEFAULT_BOARD_LAYOUT_B_ALT0 {\ {GP_ELEMENT_PIN_BUTTON, {88, 21, 4, 4, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {99, 19, 4, 4, 1, 1, 14, GP_SHAPE_ELLIPSE}},\ @@ -152,6 +155,7 @@ } // KeebBrawler-02MX +#define DEFAULT_BOARD_LAYOUT_A_ALT1_NAME "KeebBrawler-02MX" #define DEFAULT_BOARD_LAYOUT_A_ALT1 {\ {GP_ELEMENT_PIN_BUTTON, {25, 25, 19, 19, 1, 1, 7, GP_SHAPE_SQUARE, 15}},\ {GP_ELEMENT_PIN_BUTTON, {32, 27, 26, 21, 1, 1, 8, GP_SHAPE_SQUARE, 15}},\ @@ -161,6 +165,7 @@ {GP_ELEMENT_PIN_BUTTON, {16, 29, 4, 23, 1, 1, 6, GP_SHAPE_SQUARE, 15}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT1_NAME "KeebBrawler-02MX" #define DEFAULT_BOARD_LAYOUT_B_ALT1 {\ {GP_ELEMENT_PIN_BUTTON, {88, 21, 4, 4, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {97, 19, 4, 4, 1, 1, 14, GP_SHAPE_ELLIPSE}},\ @@ -174,6 +179,7 @@ } // KeebFighter-02 +#define DEFAULT_BOARD_LAYOUT_A_ALT2_NAME "KeebFighter-02" #define DEFAULT_BOARD_LAYOUT_A_ALT2 {\ {GP_ELEMENT_PIN_BUTTON, {23, 25, 16, 18, 1, 1, 26, GP_SHAPE_SQUARE, 22}},\ {GP_ELEMENT_PIN_BUTTON, {32, 27, 25, 20, 1, 1, 6, GP_SHAPE_SQUARE, 22}},\ @@ -186,6 +192,7 @@ {GP_ELEMENT_PIN_BUTTON, {40, 54, 55, 47, 1, 1, 11, GP_SHAPE_SQUARE, 135}}\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT2_NAME "KeebFighter-02" #define DEFAULT_BOARD_LAYOUT_B_ALT2 {\ {GP_ELEMENT_PIN_BUTTON, {88, 30, 81, 37, 1, 1, 16, GP_SHAPE_SQUARE, 158}},\ {GP_ELEMENT_PIN_BUTTON, {95, 24, 88, 31, 1, 1, 14, GP_SHAPE_SQUARE, 158}},\ @@ -199,6 +206,7 @@ } // KeebFighter-03 +#define DEFAULT_BOARD_LAYOUT_A_ALT3_NAME "KeebFighter-03" #define DEFAULT_BOARD_LAYOUT_A_ALT3 {\ {GP_ELEMENT_PIN_BUTTON, {28, 26, 4, 4, 1, 1, 6, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {38, 23, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ @@ -207,6 +215,7 @@ {GP_ELEMENT_PIN_BUTTON, {58, 25, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {64, 42, 5, 5, 1, 1, 11, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT3_NAME "KeebFighter-03" #define DEFAULT_BOARD_LAYOUT_B_ALT3 {\ {GP_ELEMENT_PIN_BUTTON, {68, 21, 4, 4, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {68, 31, 4, 4, 1, 1, 12, GP_SHAPE_ELLIPSE}},\ @@ -220,6 +229,7 @@ } // KeebFighter-04 +#define DEFAULT_BOARD_LAYOUT_A_ALT4_NAME "KeebFighter-04" #define DEFAULT_BOARD_LAYOUT_A_ALT4 {\ {GP_ELEMENT_PIN_BUTTON, {28, 26, 4, 4, 1, 1, 6, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {38, 23, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ @@ -230,6 +240,7 @@ {GP_ELEMENT_PIN_BUTTON, {53, 39, 4, 4, 1, 1, 19, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT4_NAME "KeebFighter-04" #define DEFAULT_BOARD_LAYOUT_B_ALT4 {\ {GP_ELEMENT_PIN_BUTTON, {68, 21, 4, 4, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {68, 31, 4, 4, 1, 1, 12, GP_SHAPE_ELLIPSE}},\ @@ -242,6 +253,7 @@ } // KeebFighter+S3 +#define DEFAULT_BOARD_LAYOUT_A_ALT5_NAME "KeebFighter+S3" #define DEFAULT_BOARD_LAYOUT_A_ALT5 {\ {GP_ELEMENT_PIN_BUTTON, {19, 23, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {29, 23, 4, 4, 1, 1, 8, GP_SHAPE_ELLIPSE}},\ @@ -251,6 +263,7 @@ {GP_ELEMENT_PIN_BUTTON, { 9, 27, 4, 4, 1, 1, 6, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT5_NAME "KeebFighter+S3" #define DEFAULT_BOARD_LAYOUT_B_ALT5 {\ {GP_ELEMENT_PIN_BUTTON, {88, 21, 4, 4, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {99, 19, 4, 4, 1, 1, 14, GP_SHAPE_ELLIPSE}},\ @@ -264,6 +277,7 @@ } // KeebFighter+S4 +#define DEFAULT_BOARD_LAYOUT_A_ALT6_NAME "KeebFighter+S4" #define DEFAULT_BOARD_LAYOUT_A_ALT6 {\ {GP_ELEMENT_PIN_BUTTON, {10, 27, 4, 4, 1, 1, 6, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {19, 23, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ @@ -273,6 +287,7 @@ {GP_ELEMENT_PIN_BUTTON, {49, 46, 6, 6, 1, 1, 11, GP_SHAPE_ELLIPSE, 135}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT6_NAME "KeebFighter+S4" #define DEFAULT_BOARD_LAYOUT_B_ALT6 {\ {GP_ELEMENT_PIN_BUTTON, {88, 21, 4, 4, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {97, 19, 4, 4, 1, 1, 14, GP_SHAPE_ELLIPSE}},\ @@ -286,6 +301,7 @@ } // KeebBrawler-01 +#define DEFAULT_BOARD_LAYOUT_A_ALT7_NAME "KeebBrawler-01" #define DEFAULT_BOARD_LAYOUT_A_ALT7 {\ {GP_ELEMENT_PIN_BUTTON, {19, 20, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {29, 20, 4, 4, 1, 1, 8, GP_SHAPE_ELLIPSE}},\ @@ -293,6 +309,7 @@ {GP_ELEMENT_PIN_BUTTON, {51, 45, 73, 38, 1, 1, 11, GP_SHAPE_PILL}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT7_NAME "KeebBrawler-01" #define DEFAULT_BOARD_LAYOUT_B_ALT7 {\ {GP_ELEMENT_PIN_BUTTON, {88, 21, 4, 4, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {97, 17, 4, 4, 1, 1, 14, GP_SHAPE_ELLIPSE}},\ diff --git a/configs/MavercadeRev3/BoardConfig.h b/configs/MavercadeRev3/BoardConfig.h index 9e4250b5fc..4a11a95d15 100644 --- a/configs/MavercadeRev3/BoardConfig.h +++ b/configs/MavercadeRev3/BoardConfig.h @@ -123,7 +123,7 @@ #define BUTTON_LAYOUT BUTTON_LAYOUT_BOARD_DEFINED_A #define BUTTON_LAYOUT_RIGHT BUTTON_LAYOUT_BOARD_DEFINED_B -// KeebBrawler-04MX rev3 +#define DEFAULT_BOARD_LAYOUT_A_NAME "KeebBrawler-04MX rev3" #define DEFAULT_BOARD_LAYOUT_A {\ {GP_ELEMENT_PIN_BUTTON, {5, 20, 12, 36, 1, 1, 6, GP_SHAPE_PILL}},\ {GP_ELEMENT_PIN_BUTTON, {19, 23, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ @@ -134,6 +134,7 @@ {GP_ELEMENT_PIN_BUTTON, {31, 14, 4, 4, 1, 1, 28, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_NAME "KeebBrawler-04MX rev3" #define DEFAULT_BOARD_LAYOUT_B {\ {GP_ELEMENT_PIN_BUTTON, {88, 21, 4, 4, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {99, 19, 4, 4, 1, 1, 14, GP_SHAPE_ELLIPSE}},\ @@ -147,6 +148,7 @@ } // KeebBrawler-03MX +#define DEFAULT_BOARD_LAYOUT_A_ALT0_NAME "KeebBrawler-03MX rev3" #define DEFAULT_BOARD_LAYOUT_A_ALT0 {\ {GP_ELEMENT_PIN_BUTTON, {5, 20, 12, 36, 1, 1, 6, GP_SHAPE_PILL}},\ {GP_ELEMENT_PIN_BUTTON, {19, 23, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ @@ -155,6 +157,7 @@ {GP_ELEMENT_PIN_BUTTON, {31, 50, 38, 43, 1, 1, 19, GP_SHAPE_PILL,135}},\ {GP_ELEMENT_PIN_BUTTON, {51, 50, 73, 43, 1, 1, 11, GP_SHAPE_PILL}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT0_NAME "KeebBrawler-03MX rev3" #define DEFAULT_BOARD_LAYOUT_B_ALT0 {\ {GP_ELEMENT_PIN_BUTTON, {88, 21, 4, 4, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {99, 19, 4, 4, 1, 1, 14, GP_SHAPE_ELLIPSE}},\ @@ -167,6 +170,7 @@ } // KeebBrawler-02MX +#define DEFAULT_BOARD_LAYOUT_A_ALT1_NAME "KeebBrawler-02MX rev3" #define DEFAULT_BOARD_LAYOUT_A_ALT1 {\ {GP_ELEMENT_PIN_BUTTON, {25, 25, 19, 19, 1, 1, 7, GP_SHAPE_SQUARE,15}},\ {GP_ELEMENT_PIN_BUTTON, {32, 27, 26, 21, 1, 1, 8, GP_SHAPE_SQUARE,15}},\ @@ -176,6 +180,7 @@ {GP_ELEMENT_PIN_BUTTON, {16, 29, 4, 23, 1, 1, 6, GP_SHAPE_SQUARE,15}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT1_NAME "KeebBrawler-02MX rev3" #define DEFAULT_BOARD_LAYOUT_B_ALT1 {\ {GP_ELEMENT_PIN_BUTTON, {88, 21, 4, 4, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {97, 19, 4, 4, 1, 1, 14, GP_SHAPE_ELLIPSE}},\ @@ -189,6 +194,7 @@ } // KeebFighter+S3 rev3 +#define DEFAULT_BOARD_LAYOUT_A_ALT2_NAME "KeebFighter-02 rev3" #define DEFAULT_BOARD_LAYOUT_A_ALT2 {\ {GP_ELEMENT_PIN_BUTTON, {19, 23, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {29, 23, 4, 4, 1, 1, 8, GP_SHAPE_ELLIPSE}},\ @@ -198,6 +204,7 @@ {GP_ELEMENT_PIN_BUTTON, {9, 27, 5, 5, 1, 1, 6, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT2_NAME "KeebFighter-02 rev3" #define DEFAULT_BOARD_LAYOUT_B_ALT2 {\ {GP_ELEMENT_PIN_BUTTON, {88, 21, 4, 4, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {97, 19, 4, 4, 1, 1, 14, GP_SHAPE_ELLIPSE}},\ @@ -212,6 +219,7 @@ } // KeebFighter+S4 rev3 +#define DEFAULT_BOARD_LAYOUT_A_ALT3_NAME "KeebFighter-03 rev3" #define DEFAULT_BOARD_LAYOUT_A_ALT3 {\ {GP_ELEMENT_PIN_BUTTON, {9, 28, 6, 6, 1, 1, 6, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {19, 23, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ @@ -222,6 +230,7 @@ {GP_ELEMENT_PIN_BUTTON, {31, 14, 4, 4, 1, 1, 28, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT3_NAME "KeebFighter-03 rev3" #define DEFAULT_BOARD_LAYOUT_B_ALT3 {\ {GP_ELEMENT_PIN_BUTTON, {88, 21, 4, 4, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {97, 19, 4, 4, 1, 1, 14, GP_SHAPE_ELLIPSE}},\ @@ -235,6 +244,7 @@ } // KeebBrawler-05 rev3 +#define DEFAULT_BOARD_LAYOUT_A_ALT4_NAME "KeebFighter-04 rev3" #define DEFAULT_BOARD_LAYOUT_A_ALT4 {\ {GP_ELEMENT_PIN_BUTTON, {5, 20, 12, 36, 1, 1, 28, GP_SHAPE_PILL}},\ {GP_ELEMENT_PIN_BUTTON, {19, 23, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\ @@ -245,6 +255,7 @@ {GP_ELEMENT_PIN_BUTTON, {115, 21, 4, 4, 1, 1, 19, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_ALT4_NAME "KeebFighter-04 rev3" #define DEFAULT_BOARD_LAYOUT_B_ALT4 {\ {GP_ELEMENT_PIN_BUTTON, {88, 21, 4, 4, 1, 1, 16, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {97, 19, 4, 4, 1, 1, 14, GP_SHAPE_ELLIPSE}},\ diff --git a/configs/OSUMGP-RP2040/BoardConfig.h b/configs/OSUMGP-RP2040/BoardConfig.h index 495d758f81..1115f7f84c 100644 --- a/configs/OSUMGP-RP2040/BoardConfig.h +++ b/configs/OSUMGP-RP2040/BoardConfig.h @@ -109,6 +109,7 @@ #define BUTTON_LAYOUT BUTTON_LAYOUT_BOARD_DEFINED_A #define BUTTON_LAYOUT_RIGHT BUTTON_LAYOUT_BOARD_DEFINED_B +#define DEFAULT_BOARD_LAYOUT_A_NAME "OSUMGP-RP2040 Default" #define DEFAULT_BOARD_LAYOUT_A {\ {GP_ELEMENT_PIN_BUTTON, {51, 34, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {51, 40, 2, 2, 1, 1, 13, GP_SHAPE_ELLIPSE}},\ @@ -122,6 +123,7 @@ {GP_ELEMENT_LEVER, {41, 28, 4, 4, 1, 0, GP_LEVER_MODE_LEFT_ANALOG}},\ } +#define DEFAULT_BOARD_LAYOUT_B_NAME "OSUMGP-RP2040 Default" #define DEFAULT_BOARD_LAYOUT_B {\ {GP_ELEMENT_PIN_BUTTON, {55, 27, 2, 2, 1, 1, 20, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {73, 27, 2, 2, 1, 1, 4, GP_SHAPE_ELLIPSE}},\ diff --git a/configs/OpenCore0/BoardConfig.h b/configs/OpenCore0/BoardConfig.h index b4ff27953d..9b6f39a8a5 100644 --- a/configs/OpenCore0/BoardConfig.h +++ b/configs/OpenCore0/BoardConfig.h @@ -134,6 +134,7 @@ #define SPLASH_MODE SPLASH_MODE_STATIC #define SPLASH_DURATION 3000 +#define DEFAULT_BOARD_LAYOUT_A_NAME "Open_Core0 Default" #define DEFAULT_BOARD_LAYOUT_A {\ {GP_ELEMENT_PIN_BUTTON, {12, 25, 7, 7, 1, 1, 9, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {28, 25, 7, 7, 1, 1, 10, GP_SHAPE_ELLIPSE}},\ @@ -149,7 +150,8 @@ {GP_ELEMENT_PIN_BUTTON, {62, 12, 2, 2, 1, 1, 26, GP_SHAPE_ELLIPSE}}\ } - #define DEFAULT_BOARD_LAYOUT_B {\ +#define DEFAULT_BOARD_LAYOUT_B_NAME "Open_Core0 Default" +#define DEFAULT_BOARD_LAYOUT_B {\ {GP_ELEMENT_PIN_BUTTON, {56, 25, 7, 7, 1, 1, 17, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {72, 22, 7, 7, 1, 1, 18, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {88, 22, 7, 7, 1, 1, 19, GP_SHAPE_ELLIPSE}},\ diff --git a/configs/OpenCore0MIXUP/BoardConfig.h b/configs/OpenCore0MIXUP/BoardConfig.h index dcec732376..b3fc6c05e5 100644 --- a/configs/OpenCore0MIXUP/BoardConfig.h +++ b/configs/OpenCore0MIXUP/BoardConfig.h @@ -130,6 +130,7 @@ #define SPLASH_MODE SPLASH_MODE_STATIC #define SPLASH_DURATION 3000 +#define DEFAULT_BOARD_LAYOUT_A_NAME "Open_Core0 MIXUP Default" #define DEFAULT_BOARD_LAYOUT_A {\ {GP_ELEMENT_PIN_BUTTON, {19, 30, 26, 37, 1, 1, 9, GP_SHAPE_SQUARE, 22}},\ {GP_ELEMENT_PIN_BUTTON, {27, 34, 34, 41, 1, 1, 11, GP_SHAPE_SQUARE, 22}},\ @@ -144,6 +145,7 @@ {GP_ELEMENT_PIN_BUTTON, {47, 19, 3, 3, 1, 1, 2, GP_SHAPE_ELLIPSE}}\ } +#define DEFAULT_BOARD_LAYOUT_B_NAME "Open_Core0 MIXUP Default" #define DEFAULT_BOARD_LAYOUT_B {\ {GP_ELEMENT_PIN_BUTTON, {61, 19, 3, 3, 1, 1, 27, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {60, 29, 4, 4, 1, 1, 18, GP_SHAPE_ELLIPSE}},\ diff --git a/configs/OpenCore0WASD/BoardConfig.h b/configs/OpenCore0WASD/BoardConfig.h index 85193debfb..9eea049b72 100644 --- a/configs/OpenCore0WASD/BoardConfig.h +++ b/configs/OpenCore0WASD/BoardConfig.h @@ -130,6 +130,7 @@ #define SPLASH_MODE SPLASH_MODE_STATIC #define SPLASH_DURATION 3000 +#define DEFAULT_BOARD_LAYOUT_A_NAME "Open_Core0 WASD Default" #define DEFAULT_BOARD_LAYOUT_A {\ {GP_ELEMENT_PIN_BUTTON, {19, 30, 26, 37, 1, 1, 9, GP_SHAPE_SQUARE,22}},\ {GP_ELEMENT_PIN_BUTTON, {27, 34, 34, 41, 1, 1, 11, GP_SHAPE_SQUARE,22}},\ @@ -144,6 +145,7 @@ {GP_ELEMENT_PIN_BUTTON, {47, 19, 3, 3, 1, 1, 2, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_NAME "Open_Core0 WASD Default" #define DEFAULT_BOARD_LAYOUT_B {\ {GP_ELEMENT_PIN_BUTTON, {81, 19, 3, 3, 1, 1, 27, GP_SHAPE_ELLIPSE}},\ {GP_ELEMENT_PIN_BUTTON, {81, 30, 88, 37, 1, 1, 18, GP_SHAPE_SQUARE,68}},\ diff --git a/configs/ZeroRhythm/BoardConfig.h b/configs/ZeroRhythm/BoardConfig.h index 6215433945..329ea0d4a7 100644 --- a/configs/ZeroRhythm/BoardConfig.h +++ b/configs/ZeroRhythm/BoardConfig.h @@ -90,6 +90,7 @@ #define SPLASH_MODE SPLASH_MODE_STATIC #define SPLASH_DURATION 3000 +#define DEFAULT_BOARD_LAYOUT_A_NAME "Zero_Rhythm Default" #define DEFAULT_BOARD_LAYOUT_A {\ {GP_ELEMENT_PIN_BUTTON, {5, 17, 12, 33, 1, 1, 28, GP_SHAPE_SQUARE,24}},\ {GP_ELEMENT_PIN_BUTTON, {19, 23, 26, 30, 1, 1, 27, GP_SHAPE_SQUARE,22}},\ @@ -102,6 +103,7 @@ {GP_ELEMENT_PIN_BUTTON, {50, 18, 3, 3, 1, 1, 29, GP_SHAPE_ELLIPSE}},\ } +#define DEFAULT_BOARD_LAYOUT_B_NAME "Zero_Rhythm Default" #define DEFAULT_BOARD_LAYOUT_B {\ {GP_ELEMENT_PIN_BUTTON, {115, 17, 122, 33, 1, 1, 1, GP_SHAPE_SQUARE,156}},\ {GP_ELEMENT_PIN_BUTTON, {101, 23, 108, 30, 1, 1, 2, GP_SHAPE_SQUARE,68}},\ diff --git a/src/layoutmanager.cpp b/src/layoutmanager.cpp index 2bf51ceb1a..4fd3d791fb 100644 --- a/src/layoutmanager.cpp +++ b/src/layoutmanager.cpp @@ -3,6 +3,11 @@ #include "buttonlayouts.h" #include "enums.pb.h" +#ifdef DEFAULT_BOARD_LAYOUT_A_NAME +#define STRINGIFY(x) #x +#define TOSTRING(x) STRINGIFY(x) +#endif + LayoutManager::LayoutList LayoutManager::getLayoutA() { const DisplayOptions& options = Storage::getInstance().getDisplayOptions(); uint16_t layoutLeft = options.buttonLayout; @@ -59,21 +64,155 @@ std::string LayoutManager::getLayoutBName() { } std::string LayoutManager::getButtonLayoutName(ButtonLayout layout) { - #define ENUM_CASE(name, value) case name: return #name; switch (layout) { - ButtonLayout_VALUELIST(ENUM_CASE) - default: return "BUTTON_LAYOUT_UNKNOWN"; + case BUTTON_LAYOUT_BOARD_DEFINED_A: { + #ifdef DEFAULT_BOARD_LAYOUT_A_NAME + return DEFAULT_BOARD_LAYOUT_A_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_A"; + #endif + } + case BUTTON_LAYOUT_BOARD_DEFINED_ALT0_A: { + #ifdef DEFAULT_BOARD_LAYOUT_A_ALT0_NAME + return DEFAULT_BOARD_LAYOUT_A_ALT0_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_ALT0_A"; + #endif + } + case BUTTON_LAYOUT_BOARD_DEFINED_ALT1_A: { + #ifdef DEFAULT_BOARD_LAYOUT_A_ALT1_NAME + return DEFAULT_BOARD_LAYOUT_A_ALT1_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_ALT1_A"; + #endif + } + case BUTTON_LAYOUT_BOARD_DEFINED_ALT2_A: { + #ifdef DEFAULT_BOARD_LAYOUT_A_ALT2_NAME + return DEFAULT_BOARD_LAYOUT_A_ALT2_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_ALT2_A"; + #endif + } + case BUTTON_LAYOUT_BOARD_DEFINED_ALT3_A: { + #ifdef DEFAULT_BOARD_LAYOUT_A_ALT3_NAME + return DEFAULT_BOARD_LAYOUT_A_ALT3_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_ALT3_A"; + #endif + } + case BUTTON_LAYOUT_BOARD_DEFINED_ALT4_A: { + #ifdef DEFAULT_BOARD_LAYOUT_A_ALT4_NAME + return DEFAULT_BOARD_LAYOUT_A_ALT4_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_ALT4_A"; + #endif + } + case BUTTON_LAYOUT_BOARD_DEFINED_ALT5_A: { + #ifdef DEFAULT_BOARD_LAYOUT_A_ALT5_NAME + return DEFAULT_BOARD_LAYOUT_A_ALT5_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_ALT5_A"; + #endif + } + case BUTTON_LAYOUT_BOARD_DEFINED_ALT6_A: { + #ifdef DEFAULT_BOARD_LAYOUT_A_ALT6_NAME + return DEFAULT_BOARD_LAYOUT_A_ALT6_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_ALT6_A"; + #endif + } + case BUTTON_LAYOUT_BOARD_DEFINED_ALT7_A: { + #ifdef DEFAULT_BOARD_LAYOUT_A_ALT7_NAME + return DEFAULT_BOARD_LAYOUT_A_ALT7_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_ALT7_A"; + #endif + } + default: { + #define ENUM_CASE(name, value) case name: return #name; + switch (layout) { + ButtonLayout_VALUELIST(ENUM_CASE) + default: return "BUTTON_LAYOUT_UNKNOWN"; + } + #undef ENUM_CASE + } } - #undef ENUM_CASE } std::string LayoutManager::getButtonLayoutRightName(ButtonLayoutRight layout) { - #define ENUM_CASE(name, value) case name: return #name; switch (layout) { - ButtonLayoutRight_VALUELIST(ENUM_CASE) - default: return "BUTTON_LAYOUT_UNKNOWN"; + case BUTTON_LAYOUT_BOARD_DEFINED_B: { + #ifdef DEFAULT_BOARD_LAYOUT_B_NAME + return DEFAULT_BOARD_LAYOUT_B_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_B"; + #endif + } + case BUTTON_LAYOUT_BOARD_DEFINED_ALT0_B: { + #ifdef DEFAULT_BOARD_LAYOUT_B_ALT0_NAME + return DEFAULT_BOARD_LAYOUT_B_ALT0_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_ALT0_B"; + #endif + } + case BUTTON_LAYOUT_BOARD_DEFINED_ALT1_B: { + #ifdef DEFAULT_BOARD_LAYOUT_B_ALT1_NAME + return DEFAULT_BOARD_LAYOUT_B_ALT1_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_ALT1_B"; + #endif + } + case BUTTON_LAYOUT_BOARD_DEFINED_ALT2_B: { + #ifdef DEFAULT_BOARD_LAYOUT_B_ALT2_NAME + return DEFAULT_BOARD_LAYOUT_B_ALT2_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_ALT2_B"; + #endif + } + case BUTTON_LAYOUT_BOARD_DEFINED_ALT3_B: { + #ifdef DEFAULT_BOARD_LAYOUT_B_ALT3_NAME + return DEFAULT_BOARD_LAYOUT_B_ALT3_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_ALT3_B"; + #endif + } + case BUTTON_LAYOUT_BOARD_DEFINED_ALT4_B: { + #ifdef DEFAULT_BOARD_LAYOUT_B_ALT4_NAME + return DEFAULT_BOARD_LAYOUT_B_ALT4_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_ALT4_B"; + #endif + } + case BUTTON_LAYOUT_BOARD_DEFINED_ALT5_B: { + #ifdef DEFAULT_BOARD_LAYOUT_B_ALT5_NAME + return DEFAULT_BOARD_LAYOUT_B_ALT5_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_ALT5_B"; + #endif + } + case BUTTON_LAYOUT_BOARD_DEFINED_ALT6_B: { + #ifdef DEFAULT_BOARD_LAYOUT_B_ALT6_NAME + return DEFAULT_BOARD_LAYOUT_B_ALT6_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_ALT6_B"; + #endif + } + case BUTTON_LAYOUT_BOARD_DEFINED_ALT7_B: { + #ifdef DEFAULT_BOARD_LAYOUT_B_ALT7_NAME + return DEFAULT_BOARD_LAYOUT_B_ALT7_NAME; + #else + return "BUTTON_LAYOUT_BOARD_DEFINED_ALT7_B"; + #endif + } + default: { + #define ENUM_CASE(name, value) case name: return #name; + switch (layout) { + ButtonLayoutRight_VALUELIST(ENUM_CASE) + default: return "BUTTON_LAYOUT_UNKNOWN"; + } + #undef ENUM_CASE + } } - #undef ENUM_CASE } LayoutManager::LayoutList LayoutManager::getLeftLayout(uint16_t index) { diff --git a/www/src/Pages/DisplayConfig.jsx b/www/src/Pages/DisplayConfig.jsx index f2e0ff4f88..67bf2bde10 100644 --- a/www/src/Pages/DisplayConfig.jsx +++ b/www/src/Pages/DisplayConfig.jsx @@ -400,7 +400,7 @@ export default function DisplayConfigPage() { key={`buttonLayout-option-${i}`} value={buttonLayoutDefinitions.buttonLayout[o]} > - {t(`LayoutConfig:layouts.left.${o}`)} + {t(`LayoutConfig:layouts.left.${o}`, { defaultValue: o })} ), )} @@ -424,7 +424,7 @@ export default function DisplayConfigPage() { key={`buttonLayoutRight-option-${i}`} value={buttonLayoutDefinitions.buttonLayoutRight[o]} > - {t(`LayoutConfig:layouts.right.${o}`)} + {t(`LayoutConfig:layouts.right.${o}`, { defaultValue: o })} ))} @@ -480,7 +480,7 @@ export default function DisplayConfigPage() { buttonLayoutDefinitions.buttonLayout[o] } > - {t(`LayoutConfig:layouts.left.${o}`)} + {t(`LayoutConfig:layouts.left.${o}`, { defaultValue: o })} ))} @@ -576,7 +576,7 @@ export default function DisplayConfigPage() { buttonLayoutDefinitions.buttonLayoutRight[o] } > - {t(`LayoutConfig:layouts.right.${o}`)} + {t(`LayoutConfig:layouts.right.${o}`, { defaultValue: o })} ))}