Skip to content

Increase custom layout count to 10 #1489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Increase custom layout count to 10 #1489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78e5c20
Increase custom layout count to 10
TheTrainGoes Sep 11, 2025
ac34006
Update
TheTrainGoes Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions headers/layoutmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,21 @@ class LayoutManager {
LayoutList drawBoardDefinedAlt3A();
LayoutList drawBoardDefinedAlt4A();
LayoutList drawBoardDefinedAlt5A();
LayoutList drawBoardDefinedAlt6A();
LayoutList drawBoardDefinedAlt7A();
LayoutList drawBoardDefinedAlt8A();
LayoutList drawBoardDefinedAlt9A();
LayoutList drawBoardDefinedB();
LayoutList drawBoardDefinedAlt0B();
LayoutList drawBoardDefinedAlt1B();
LayoutList drawBoardDefinedAlt2B();
LayoutList drawBoardDefinedAlt3B();
LayoutList drawBoardDefinedAlt4B();
LayoutList drawBoardDefinedAlt5B();
LayoutList drawBoardDefinedAlt6B();
LayoutList drawBoardDefinedAlt7B();
LayoutList drawBoardDefinedAlt8B();
LayoutList drawBoardDefinedAlt9B();
LayoutList drawDancepadDDRLeft();
LayoutList drawDancepadDDRSolo();
LayoutList drawDancepadPIULeft();
Expand Down
8 changes: 8 additions & 0 deletions proto/enums.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ enum ButtonLayout
BUTTON_LAYOUT_BOARD_DEFINED_ALT3_A = 37;
BUTTON_LAYOUT_BOARD_DEFINED_ALT4_A = 38;
BUTTON_LAYOUT_BOARD_DEFINED_ALT5_A = 39;
BUTTON_LAYOUT_BOARD_DEFINED_ALT6_A = 40;
BUTTON_LAYOUT_BOARD_DEFINED_ALT7_A = 41;
BUTTON_LAYOUT_BOARD_DEFINED_ALT8_A = 42;
BUTTON_LAYOUT_BOARD_DEFINED_ALT9_A = 43;
}

enum ButtonLayoutRight
Expand Down Expand Up @@ -98,6 +102,10 @@ enum ButtonLayoutRight
BUTTON_LAYOUT_BOARD_DEFINED_ALT3_B = 43;
BUTTON_LAYOUT_BOARD_DEFINED_ALT4_B = 44;
BUTTON_LAYOUT_BOARD_DEFINED_ALT5_B = 45;
BUTTON_LAYOUT_BOARD_DEFINED_ALT6_B = 46;
BUTTON_LAYOUT_BOARD_DEFINED_ALT7_B = 47;
BUTTON_LAYOUT_BOARD_DEFINED_ALT8_B = 48;
BUTTON_LAYOUT_BOARD_DEFINED_ALT9_B = 49;
}

enum SplashMode
Expand Down
82 changes: 81 additions & 1 deletion src/layoutmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,15 @@ LayoutManager::LayoutList LayoutManager::getLeftLayout(uint16_t index) {
case BUTTON_LAYOUT_BOARD_DEFINED_ALT4_A:
return drawBoardDefinedAlt4A();
case BUTTON_LAYOUT_BOARD_DEFINED_ALT5_A:
return drawBoardDefinedAlt5A();
return drawBoardDefinedAlt5A();
case BUTTON_LAYOUT_BOARD_DEFINED_ALT6_A:
return drawBoardDefinedAlt6A();
case BUTTON_LAYOUT_BOARD_DEFINED_ALT7_A:
return drawBoardDefinedAlt7A();
case BUTTON_LAYOUT_BOARD_DEFINED_ALT8_A:
return drawBoardDefinedAlt8A();
case BUTTON_LAYOUT_BOARD_DEFINED_ALT9_A:
return drawBoardDefinedAlt9A();
default:
break;
}
Expand Down Expand Up @@ -255,6 +263,14 @@ LayoutManager::LayoutList LayoutManager::getRightLayout(uint16_t index) {
return this->drawBoardDefinedAlt4B();
case BUTTON_LAYOUT_BOARD_DEFINED_ALT5_B:
return this->drawBoardDefinedAlt5B();
case BUTTON_LAYOUT_BOARD_DEFINED_ALT6_B:
return this->drawBoardDefinedAlt6B();
case BUTTON_LAYOUT_BOARD_DEFINED_ALT7_B:
return this->drawBoardDefinedAlt7B();
case BUTTON_LAYOUT_BOARD_DEFINED_ALT8_B:
return this->drawBoardDefinedAlt8B();
case BUTTON_LAYOUT_BOARD_DEFINED_ALT9_B:
return this->drawBoardDefinedAlt9B();
default:
break;
}
Expand Down Expand Up @@ -757,6 +773,38 @@ LayoutManager::LayoutList LayoutManager::drawBoardDefinedAlt5A() {
#endif
}

LayoutManager::LayoutList LayoutManager::drawBoardDefinedAlt6A() {
#ifdef DEFAULT_BOARD_LAYOUT_A_ALT6
return DEFAULT_BOARD_LAYOUT_A_ALT6;
#else
return {};
#endif
}

LayoutManager::LayoutList LayoutManager::drawBoardDefinedAlt7A() {
#ifdef DEFAULT_BOARD_LAYOUT_A_ALT7
return DEFAULT_BOARD_LAYOUT_A_ALT7;
#else
return {};
#endif
}

LayoutManager::LayoutList LayoutManager::drawBoardDefinedAlt8A() {
#ifdef DEFAULT_BOARD_LAYOUT_A_ALT8
return DEFAULT_BOARD_LAYOUT_A_ALT8;
#else
return {};
#endif
}

LayoutManager::LayoutList LayoutManager::drawBoardDefinedAlt9A() {
#ifdef DEFAULT_BOARD_LAYOUT_A_ALT9
return DEFAULT_BOARD_LAYOUT_A_ALT9;
#else
return {};
#endif
}

LayoutManager::LayoutList LayoutManager::drawBoardDefinedB() {
#ifdef DEFAULT_BOARD_LAYOUT_B
return DEFAULT_BOARD_LAYOUT_B;
Expand Down Expand Up @@ -812,3 +860,35 @@ LayoutManager::LayoutList LayoutManager::drawBoardDefinedAlt5B() {
return {};
#endif
}

LayoutManager::LayoutList LayoutManager::drawBoardDefinedAlt6B() {
#ifdef DEFAULT_BOARD_LAYOUT_B_ALT6
return DEFAULT_BOARD_LAYOUT_B_ALT6;
#else
return {};
#endif
}

LayoutManager::LayoutList LayoutManager::drawBoardDefinedAlt7B() {
#ifdef DEFAULT_BOARD_LAYOUT_B_ALT7
return DEFAULT_BOARD_LAYOUT_B_ALT7;
#else
return {};
#endif
}

LayoutManager::LayoutList LayoutManager::drawBoardDefinedAlt8B() {
#ifdef DEFAULT_BOARD_LAYOUT_B_ALT8
return DEFAULT_BOARD_LAYOUT_B_ALT8;
#else
return {};
#endif
}

LayoutManager::LayoutList LayoutManager::drawBoardDefinedAlt9B() {
#ifdef DEFAULT_BOARD_LAYOUT_B_ALT9
return DEFAULT_BOARD_LAYOUT_B_ALT9;
#else
return {};
#endif
}
8 changes: 8 additions & 0 deletions www/src/Locales/en/LayoutConfig.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ export default {
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',
BUTTON_LAYOUT_BOARD_DEFINED_ALT6_A: 'Board Defined Alternate 6',
BUTTON_LAYOUT_BOARD_DEFINED_ALT7_A: 'Board Defined Alternate 7',
BUTTON_LAYOUT_BOARD_DEFINED_ALT8_A: 'Board Defined Alternate 8',
BUTTON_LAYOUT_BOARD_DEFINED_ALT9_A: 'Board Defined Alternate 9',
},
right: {
BUTTON_LAYOUT_ARCADE: 'Arcade',
Expand Down Expand Up @@ -94,6 +98,10 @@ export default {
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',
BUTTON_LAYOUT_BOARD_DEFINED_ALT6_B: 'Board Defined Alternate 6',
BUTTON_LAYOUT_BOARD_DEFINED_ALT7_B: 'Board Defined Alternate 7',
BUTTON_LAYOUT_BOARD_DEFINED_ALT8_B: 'Board Defined Alternate 8',
BUTTON_LAYOUT_BOARD_DEFINED_ALT9_B: 'Board Defined Alternate 9',
},
},
};
8 changes: 8 additions & 0 deletions www/src/Locales/es-MX/LayoutConfig.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ export default {
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',
BUTTON_LAYOUT_BOARD_DEFINED_ALT6_A: 'Definido por Placa Alternativo 6',
BUTTON_LAYOUT_BOARD_DEFINED_ALT7_A: 'Definido por Placa Alternativo 7',
BUTTON_LAYOUT_BOARD_DEFINED_ALT8_A: 'Definido por Placa Alternativo 8',
BUTTON_LAYOUT_BOARD_DEFINED_ALT9_A: 'Definido por Placa Alternativo 9',
},
right: {
BUTTON_LAYOUT_ARCADE: 'Arcade',
Expand Down Expand Up @@ -94,6 +98,10 @@ export default {
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',
BUTTON_LAYOUT_BOARD_DEFINED_ALT6_B: 'Definido por Placa Alternativo 6',
BUTTON_LAYOUT_BOARD_DEFINED_ALT7_B: 'Definido por Placa Alternativo 7',
BUTTON_LAYOUT_BOARD_DEFINED_ALT8_B: 'Definido por Placa Alternativo 8',
BUTTON_LAYOUT_BOARD_DEFINED_ALT9_B: 'Definido por Placa Alternativo 9',
},
},
};
32 changes: 20 additions & 12 deletions www/src/Locales/ja-JP/LayoutConfig.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,16 @@ export default {
BUTTON_LAYOUT_6GAWD_A: '6GAWD (左側)',
BUTTON_LAYOUT_6GAWD_ALLBUTTON_A: '6GAWD All Button (左側)',
BUTTON_LAYOUT_6GAWD_ALLBUTTONPLUS_A: '6GAWD All Button Pinky (左側)',
BUTTON_LAYOUT_BOARD_DEFINED_ALT0_A: 'ボード専用設定０',
BUTTON_LAYOUT_BOARD_DEFINED_ALT1_A: 'ボード専用設定１',
BUTTON_LAYOUT_BOARD_DEFINED_ALT2_A: 'ボード専用設定２',
BUTTON_LAYOUT_BOARD_DEFINED_ALT3_A: 'ボード専用設定３',
BUTTON_LAYOUT_BOARD_DEFINED_ALT4_A: 'ボード専用設定４',
BUTTON_LAYOUT_BOARD_DEFINED_ALT5_A: 'ボード専用設定５',
BUTTON_LAYOUT_BOARD_DEFINED_ALT0_A: 'ボード専用設定 0',
BUTTON_LAYOUT_BOARD_DEFINED_ALT1_A: 'ボード専用設定 1',
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',
BUTTON_LAYOUT_BOARD_DEFINED_ALT6_A: 'ボード専用設定 6',
BUTTON_LAYOUT_BOARD_DEFINED_ALT7_A: 'ボード専用設定 7',
BUTTON_LAYOUT_BOARD_DEFINED_ALT8_A: 'ボード専用設定 8',
BUTTON_LAYOUT_BOARD_DEFINED_ALT9_A: 'ボード専用設定 9',
},
right: {
BUTTON_LAYOUT_ARCADE: 'アーケード',
Expand Down Expand Up @@ -77,12 +81,16 @@ export default {
BUTTON_LAYOUT_6GAWD_B: '6GAWD (右側)',
BUTTON_LAYOUT_6GAWD_ALLBUTTON_B: '6GAWD All Button (右側)',
BUTTON_LAYOUT_6GAWD_ALLBUTTONPLUS_B: '6GAWD All Button Pinky (右側)',
BUTTON_LAYOUT_BOARD_DEFINED_ALT0_B: 'ボード専用設定０',
BUTTON_LAYOUT_BOARD_DEFINED_ALT1_B: 'ボード専用設定１',
BUTTON_LAYOUT_BOARD_DEFINED_ALT2_B: 'ボード専用設定２',
BUTTON_LAYOUT_BOARD_DEFINED_ALT3_B: 'ボード専用設定３',
BUTTON_LAYOUT_BOARD_DEFINED_ALT4_B: 'ボード専用設定４',
BUTTON_LAYOUT_BOARD_DEFINED_ALT5_B: 'ボード専用設定５',
BUTTON_LAYOUT_BOARD_DEFINED_ALT0_B: 'ボード専用設定 0',
BUTTON_LAYOUT_BOARD_DEFINED_ALT1_B: 'ボード専用設定 1',
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',
BUTTON_LAYOUT_BOARD_DEFINED_ALT6_B: 'ボード専用設定 6',
BUTTON_LAYOUT_BOARD_DEFINED_ALT7_B: 'ボード専用設定 7',
BUTTON_LAYOUT_BOARD_DEFINED_ALT8_B: 'ボード専用設定 8',
BUTTON_LAYOUT_BOARD_DEFINED_ALT9_B: 'ボード専用設定 9',
},
},
};
8 changes: 8 additions & 0 deletions www/src/Locales/ko-KR/LayoutConfig.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ export default {
BUTTON_LAYOUT_BOARD_DEFINED_ALT3_A: '보드 설정값 대체 3',
BUTTON_LAYOUT_BOARD_DEFINED_ALT4_A: '보드 설정값 대체 4',
BUTTON_LAYOUT_BOARD_DEFINED_ALT5_A: '보드 설정값 대체 5',
BUTTON_LAYOUT_BOARD_DEFINED_ALT6_A: '보드 설정값 대체 6',
BUTTON_LAYOUT_BOARD_DEFINED_ALT7_A: '보드 설정값 대체 7',
BUTTON_LAYOUT_BOARD_DEFINED_ALT8_A: '보드 설정값 대체 8',
BUTTON_LAYOUT_BOARD_DEFINED_ALT9_A: '보드 설정값 대체 9',
},
right: {
BUTTON_LAYOUT_ARCADE: '아케이드',
Expand Down Expand Up @@ -94,6 +98,10 @@ export default {
BUTTON_LAYOUT_BOARD_DEFINED_ALT3_B: '보드 설정값 대체 3',
BUTTON_LAYOUT_BOARD_DEFINED_ALT4_B: '보드 설정값 대체 4',
BUTTON_LAYOUT_BOARD_DEFINED_ALT5_B: '보드 설정값 대체 5',
BUTTON_LAYOUT_BOARD_DEFINED_ALT6_B: '보드 설정값 대체 6',
BUTTON_LAYOUT_BOARD_DEFINED_ALT7_B: '보드 설정값 대체 7',
BUTTON_LAYOUT_BOARD_DEFINED_ALT8_B: '보드 설정값 대체 8',
BUTTON_LAYOUT_BOARD_DEFINED_ALT9_B: '보드 설정값 대체 9',
},
},
};