cchen/GP2040-CE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add additional board defined layout slot (#1385)

Browse Source 
This PR adds another board defined layout slot for boardconfig.h.  This also adds a layout for the Haute42|COSMOX E16 Southpaw.
This commit is contained in:
TheTrain
2025-06-03 10:55:47 -04:00
committed by GitHub
parent 805f41e2a6
commit 41b2149c8b
8 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
configs/Haute42COSMOX/BoardConfig.h
View File

@@ -262,6 +262,35 @@
{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 {\
{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}},\
{GP_ELEMENT_PIN_BUTTON, {86, 27, 4, 4, 1, 1, 3, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_PIN_BUTTON, {78, 32, 4, 4, 1, 1, 5, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_PIN_BUTTON, {87, 47, 4, 4, 1, 1, 19, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_PIN_BUTTON, {66, 17, 4, 4, 1, 1, 26, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_PIN_BUTTON, {75, 49, 5, 5, 1, 1, 2, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_PIN_BUTTON, {63, 47, 4, 4, 1, 1, 18, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_PIN_BUTTON, {54, 15, 2, 2, 1, 1, 17, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_PIN_BUTTON, {48, 15, 2, 2, 1, 1, 16, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_PIN_BUTTON, {42, 15, 2, 2, 1, 1, 20, GP_SHAPE_ELLIPSE}},\
{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 {\
{GP_ELEMENT_PIN_BUTTON, {69, 27, 4, 4, 1, 1, 10, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_PIN_BUTTON, {59, 25, 4, 4, 1, 1, 11, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_PIN_BUTTON, {49, 25, 4, 4, 1, 1, 12, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_PIN_BUTTON, {39, 27, 4, 4, 1, 1, 13, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_PIN_BUTTON, {69, 37, 4, 4, 1, 1, 6, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_PIN_BUTTON, {59, 35, 4, 4, 1, 1, 7, GP_SHAPE_ELLIPSE}},\
{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

2
headers/layoutmanager.h
View File

@@ -109,12 +109,14 @@ class LayoutManager {
LayoutList drawBoardDefinedAlt2A();
LayoutList drawBoardDefinedAlt3A();
LayoutList drawBoardDefinedAlt4A();
LayoutList drawBoardDefinedAlt5A();
LayoutList drawBoardDefinedB();
LayoutList drawBoardDefinedAlt0B();
LayoutList drawBoardDefinedAlt1B();
LayoutList drawBoardDefinedAlt2B();
LayoutList drawBoardDefinedAlt3B();
LayoutList drawBoardDefinedAlt4B();
LayoutList drawBoardDefinedAlt5B();
LayoutList drawDancepadDDRLeft();
LayoutList drawDancepadDDRSolo();
LayoutList drawDancepadPIULeft();

2
proto/enums.proto
View File

@@ -45,6 +45,7 @@ enum ButtonLayout
BUTTON_LAYOUT_BOARD_DEFINED_ALT2_A = 36;
BUTTON_LAYOUT_BOARD_DEFINED_ALT3_A = 37;
BUTTON_LAYOUT_BOARD_DEFINED_ALT4_A = 38;
BUTTON_LAYOUT_BOARD_DEFINED_ALT5_A = 39;
}
enum ButtonLayoutRight
@@ -96,6 +97,7 @@ enum ButtonLayoutRight
BUTTON_LAYOUT_BOARD_DEFINED_ALT2_B = 42;
BUTTON_LAYOUT_BOARD_DEFINED_ALT3_B = 43;
BUTTON_LAYOUT_BOARD_DEFINED_ALT4_B = 44;
BUTTON_LAYOUT_BOARD_DEFINED_ALT5_B = 45;
}
enum SplashMode

20
src/layoutmanager.cpp
View File

@@ -149,6 +149,8 @@ LayoutManager::LayoutList LayoutManager::getLeftLayout(uint16_t index) {
return drawBoardDefinedAlt3A();
case BUTTON_LAYOUT_BOARD_DEFINED_ALT4_A:
return drawBoardDefinedAlt4A();
case BUTTON_LAYOUT_BOARD_DEFINED_ALT5_A:
return drawBoardDefinedAlt5A();
default:
break;
}
@@ -251,6 +253,8 @@ LayoutManager::LayoutList LayoutManager::getRightLayout(uint16_t index) {
return this->drawBoardDefinedAlt3B();
case BUTTON_LAYOUT_BOARD_DEFINED_ALT4_B:
return this->drawBoardDefinedAlt4B();
case BUTTON_LAYOUT_BOARD_DEFINED_ALT5_B:
return this->drawBoardDefinedAlt5B();
default:
break;
}
@@ -745,6 +749,14 @@ LayoutManager::LayoutList LayoutManager::drawBoardDefinedAlt4A() {
#endif
}
LayoutManager::LayoutList LayoutManager::drawBoardDefinedAlt5A() {
#ifdef DEFAULT_BOARD_LAYOUT_A_ALT5
return DEFAULT_BOARD_LAYOUT_A_ALT5;
#else
return {};
#endif
}
LayoutManager::LayoutList LayoutManager::drawBoardDefinedB() {
#ifdef DEFAULT_BOARD_LAYOUT_B
return DEFAULT_BOARD_LAYOUT_B;
@@ -792,3 +804,11 @@ LayoutManager::LayoutList LayoutManager::drawBoardDefinedAlt4B() {
return {};
#endif
}
LayoutManager::LayoutList LayoutManager::drawBoardDefinedAlt5B() {
#ifdef DEFAULT_BOARD_LAYOUT_B_ALT5
return DEFAULT_BOARD_LAYOUT_B_ALT5;
#else
return {};
#endif
}

2
www/src/Locales/en/LayoutConfig.jsx
View File

@@ -44,6 +44,7 @@ export default {
BUTTON_LAYOUT_BOARD_DEFINED_ALT2_A: 'Board Defined Alternate 2',
BUTTON_LAYOUT_BOARD_DEFINED_ALT3_A: 'Board Defined Alternate 3',
BUTTON_LAYOUT_BOARD_DEFINED_ALT4_A: 'Board Defined Alternate 4',
BUTTON_LAYOUT_BOARD_DEFINED_ALT5_A: 'Board Defined Alternate 5',
},
right: {
BUTTON_LAYOUT_ARCADE: 'Arcade',
@@ -92,6 +93,7 @@ export default {
BUTTON_LAYOUT_BOARD_DEFINED_ALT2_B: 'Board Defined Alternate 2',
BUTTON_LAYOUT_BOARD_DEFINED_ALT3_B: 'Board Defined Alternate 3',
BUTTON_LAYOUT_BOARD_DEFINED_ALT4_B: 'Board Defined Alternate 4',
BUTTON_LAYOUT_BOARD_DEFINED_ALT5_B: 'Board Defined Alternate 5',
},
},
};

2
www/src/Locales/es-MX/LayoutConfig.jsx
View File

@@ -44,6 +44,7 @@ export default {
BUTTON_LAYOUT_BOARD_DEFINED_ALT2_A: 'Definido por Placa Alternativo 2',
BUTTON_LAYOUT_BOARD_DEFINED_ALT3_A: 'Definido por Placa Alternativo 3',
BUTTON_LAYOUT_BOARD_DEFINED_ALT4_A: 'Definido por Placa Alternativo 4',
BUTTON_LAYOUT_BOARD_DEFINED_ALT5_A: 'Definido por Placa Alternativo 5',
},
right: {
BUTTON_LAYOUT_ARCADE: 'Arcade',
@@ -92,6 +93,7 @@ export default {
BUTTON_LAYOUT_BOARD_DEFINED_ALT2_B: 'Definido por Placa Alternativo 2',
BUTTON_LAYOUT_BOARD_DEFINED_ALT3_B: 'Definido por Placa Alternativo 3',
BUTTON_LAYOUT_BOARD_DEFINED_ALT4_B: 'Definido por Placa Alternativo 4',
BUTTON_LAYOUT_BOARD_DEFINED_ALT5_B: 'Definido por Placa Alternativo 5',
},
},
};

2
www/src/Locales/ja-JP/LayoutConfig.jsx
View File

@@ -39,6 +39,7 @@ export default {
BUTTON_LAYOUT_BOARD_DEFINED_ALT2_A: 'ボード専用設定２',
BUTTON_LAYOUT_BOARD_DEFINED_ALT3_A: 'ボード専用設定３',
BUTTON_LAYOUT_BOARD_DEFINED_ALT4_A: 'ボード専用設定４',
BUTTON_LAYOUT_BOARD_DEFINED_ALT5_A: 'ボード専用設定5',
},
right: {
BUTTON_LAYOUT_ARCADE: 'アーケード',
@@ -81,6 +82,7 @@ export default {
BUTTON_LAYOUT_BOARD_DEFINED_ALT2_B: 'ボード専用設定２',
BUTTON_LAYOUT_BOARD_DEFINED_ALT3_B: 'ボード専用設定３',
BUTTON_LAYOUT_BOARD_DEFINED_ALT4_B: 'ボード専用設定４',
BUTTON_LAYOUT_BOARD_DEFINED_ALT5_B: 'ボード専用設定5',
},
},
};

2
www/src/Locales/ko-KR/LayoutConfig.jsx
View File

@@ -44,6 +44,7 @@ export default {
BUTTON_LAYOUT_BOARD_DEFINED_ALT2_A: '보드 설정값 대체 2',
BUTTON_LAYOUT_BOARD_DEFINED_ALT3_A: '보드 설정값 대체 3',
BUTTON_LAYOUT_BOARD_DEFINED_ALT4_A: '보드 설정값 대체 4',
BUTTON_LAYOUT_BOARD_DEFINED_ALT5_A: '보드 설정값 대체 5',
},
right: {
BUTTON_LAYOUT_ARCADE: '아케이드',
@@ -92,6 +93,7 @@ export default {
BUTTON_LAYOUT_BOARD_DEFINED_ALT2_B: '보드 설정값 대체 2',
BUTTON_LAYOUT_BOARD_DEFINED_ALT3_B: '보드 설정값 대체 3',
BUTTON_LAYOUT_BOARD_DEFINED_ALT4_B: '보드 설정값 대체 4',
BUTTON_LAYOUT_BOARD_DEFINED_ALT5_B: '보드 설정값 대체 5',
},
},
};