Skip to content
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

Jump to bottom

Update to add R16 display layout #1097

Merged
merged 1 commit into from
Jul 31, 2024
Merged

Update to add R16 display layout #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 26 additions & 0 deletions headers/buttonlayouts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,32 @@
{GP_ELEMENT_BTN_BUTTON, {89, 37, 4, 4, 1, 1, GAMEPAD_MASK_L2, GP_SHAPE_ELLIPSE}}\
}

#define BUTTON_GROUP_STICKLESSR16A {\
{GP_ELEMENT_DIR_BUTTON, {47, 19, 4, 4, 1, 1, GAMEPAD_MASK_UP, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_DIR_BUTTON, {32, 27, 4, 4, 1, 1, GAMEPAD_MASK_LEFT, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_DIR_BUTTON, {42, 27, 4, 4, 1, 1, GAMEPAD_MASK_DOWN, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_DIR_BUTTON, {50, 32, 4, 4, 1, 1, GAMEPAD_MASK_RIGHT, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_DIR_BUTTON, {52, 47, 4, 4, 1, 1, GAMEPAD_MASK_UP, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_BTN_BUTTON, {64, 17, 4, 4, 1, 1, GAMEPAD_MASK_L3, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_BTN_BUTTON, {22, 30, 4, 4, 1, 1, GAMEPAD_MASK_L3, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_BTN_BUTTON, {66, 45, 4, 4, 1, 1, GAMEPAD_MASK_R3, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_BTN_BUTTON, {77, 15, 2, 2, 1, 1, GAMEPAD_MASK_A2, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_BTN_BUTTON, {82, 15, 2, 2, 1, 1, GAMEPAD_MASK_A1, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_BTN_BUTTON, {87, 15, 2, 2, 1, 1, GAMEPAD_MASK_S1, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_BTN_BUTTON, {92, 15, 2, 2, 1, 1, GAMEPAD_MASK_S2, GP_SHAPE_ELLIPSE}}\
}

#define BUTTON_GROUP_STICKLESS_BUTTONSR16B {\
{GP_ELEMENT_BTN_BUTTON, {59, 27, 4, 4, 1, 1, GAMEPAD_MASK_B3, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_BTN_BUTTON, {69, 25, 4, 4, 1, 1, GAMEPAD_MASK_B4, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_BTN_BUTTON, {79, 25, 4, 4, 1, 1, GAMEPAD_MASK_R1, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_BTN_BUTTON, {89, 27, 4, 4, 1, 1, GAMEPAD_MASK_L1, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_BTN_BUTTON, {59, 37, 4, 4, 1, 1, GAMEPAD_MASK_B1, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_BTN_BUTTON, {69, 35, 4, 4, 1, 1, GAMEPAD_MASK_B2, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_BTN_BUTTON, {79, 35, 4, 4, 1, 1, GAMEPAD_MASK_R2, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_BTN_BUTTON, {89, 37, 4, 4, 1, 1, GAMEPAD_MASK_L2, GP_SHAPE_ELLIPSE}}\
}

#define BUTTON_GROUP_STICKLESS14A {\
{GP_ELEMENT_DIR_BUTTON, {26, 20, 7, 7, 1, 1, GAMEPAD_MASK_LEFT, GP_SHAPE_ELLIPSE}},\
{GP_ELEMENT_DIR_BUTTON, {42, 20, 7, 7, 1, 1, GAMEPAD_MASK_DOWN, GP_SHAPE_ELLIPSE}},\
Expand Down
2 changes: 2 additions & 0 deletions headers/layoutmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ class LayoutManager {
LayoutList drawSticklessButtons13B();
LayoutList drawStickless16A();
LayoutList drawSticklessButtons16B();
LayoutList drawSticklessR16A();
LayoutList drawSticklessButtonsR16B();
LayoutList drawStickless14A();
LayoutList drawSticklessButtons14B();
LayoutList drawButtonLayoutLeft();
Expand Down
2 changes: 2 additions & 0 deletions proto/enums.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ enum ButtonLayout
BUTTON_LAYOUT_6GAWD_A = 30;
BUTTON_LAYOUT_6GAWD_ALLBUTTON_A = 31;
BUTTON_LAYOUT_6GAWD_ALLBUTTONPLUS_A = 32;
BUTTON_LAYOUT_STICKLESS_R16 = 33;
}

enum ButtonLayoutRight
Expand Down Expand Up @@ -82,6 +83,7 @@ enum ButtonLayoutRight
BUTTON_LAYOUT_6GAWD_B = 34;
BUTTON_LAYOUT_6GAWD_ALLBUTTON_B = 35;
BUTTON_LAYOUT_6GAWD_ALLBUTTONPLUS_B = 36;
BUTTON_LAYOUT_STICKLESS_R16B = 37;
}

enum SplashMode
Expand Down
1 change: 1 addition & 0 deletions src/addons/neopicoleds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@ std::vector<std::vector<Pixel>> NeoPicoLEDAddon::createLEDLayout(ButtonLayout la
case BUTTON_LAYOUT_STICKLESS_13:
case BUTTON_LAYOUT_STICKLESS_14:
case BUTTON_LAYOUT_STICKLESS_16:
case BUTTON_LAYOUT_STICKLESS_R16:
case BUTTON_LAYOUT_BOARD_DEFINED_A:
return generatedLEDStickless(&positions);
case BUTTON_LAYOUT_FIGHTBOARD_MIRRORED:
Expand Down
6 changes: 5 additions & 1 deletion src/config_legacy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ namespace ConfigLegacy
BUTTON_LAYOUT_STICKLESS_13,
BUTTON_LAYOUT_STICKLESS_16,
BUTTON_LAYOUT_STICKLESS_14,
BUTTON_LAYOUT_STICKLESS_R16,
};

enum ButtonLayoutRight
Expand All @@ -139,6 +140,7 @@ namespace ConfigLegacy
BUTTON_LAYOUT_STICKLESS_13B,
BUTTON_LAYOUT_STICKLESS_16B,
BUTTON_LAYOUT_STICKLESS_14B,
BUTTON_LAYOUT_STICKLESS_R16B,
};

enum SplashMode
Expand Down Expand Up @@ -561,6 +563,7 @@ static bool isValidButtonLayout(ConfigLegacy::ButtonLayout buttonLayout)
case BUTTON_LAYOUT_OPENCORE0WASDA:
case BUTTON_LAYOUT_STICKLESS_13:
case BUTTON_LAYOUT_STICKLESS_16:
case BUTTON_LAYOUT_STICKLESS_R16:
case BUTTON_LAYOUT_STICKLESS_14:
return true;
}
Expand Down Expand Up @@ -591,7 +594,8 @@ static bool isValidButtonLayoutRight(ConfigLegacy::ButtonLayoutRight buttonLayou
case BUTTON_LAYOUT_KEYBOARD8B:
case BUTTON_LAYOUT_OPENCORE0WASDB:
case BUTTON_LAYOUT_STICKLESS_13B:
case BUTTON_LAYOUT_STICKLESS_16B:
case BUTTON_LAYOUT_STICKLESS_16B:
case BUTTON_LAYOUT_STICKLESS_R16B:
case BUTTON_LAYOUT_STICKLESS_14B:
return true;
}
Expand Down
14 changes: 14 additions & 0 deletions src/layoutmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ LayoutManager::LayoutList LayoutManager::getLeftLayout(uint16_t index) {
return drawStickless13A();
case BUTTON_LAYOUT_STICKLESS_16:
return drawStickless16A();
case BUTTON_LAYOUT_STICKLESS_R16:
return drawSticklessR16A();
case BUTTON_LAYOUT_STICKLESS_14:
return drawStickless14A();
case BUTTON_LAYOUT_DANCEPAD_DDR_LEFT:
Expand Down Expand Up @@ -167,6 +169,8 @@ LayoutManager::LayoutList LayoutManager::getRightLayout(uint16_t index) {
return this->drawSticklessButtons13B();
case BUTTON_LAYOUT_STICKLESS_16B:
return this->drawSticklessButtons16B();
case BUTTON_LAYOUT_STICKLESS_R16B:
return this->drawSticklessButtonsR16B();
case BUTTON_LAYOUT_STICKLESS_14B:
return this->drawSticklessButtons14B();
case BUTTON_LAYOUT_DANCEPADB:
Expand Down Expand Up @@ -406,6 +410,16 @@ LayoutManager::LayoutList LayoutManager::drawSticklessButtons16B()
return BUTTON_GROUP_STICKLESS_BUTTONS16B;
}

LayoutManager::LayoutList LayoutManager::drawSticklessR16A()
{
return BUTTON_GROUP_STICKLESSR16A;
}

LayoutManager::LayoutList LayoutManager::drawSticklessButtonsR16B()
{
return BUTTON_GROUP_STICKLESS_BUTTONSR16B;
}

LayoutManager::LayoutList LayoutManager::drawStickless14A()
{
return BUTTON_GROUP_STICKLESS14A;
Expand Down
2 changes: 2 additions & 0 deletions www/server/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,7 @@ app.get('/api/getButtonLayoutDefs', (req, res) => {
BUTTON_LAYOUT_6GAWD_A: 30,
BUTTON_LAYOUT_6GAWD_ALLBUTTON_A: 31,
BUTTON_LAYOUT_6GAWD_ALLBUTTONPLUS_A: 32,
BUTTON_LAYOUT_STICKLESS_R16: 33,
},
buttonLayoutRight: {
BUTTON_LAYOUT_ARCADE: 0,
Expand Down Expand Up @@ -731,6 +732,7 @@ app.get('/api/getButtonLayoutDefs', (req, res) => {
BUTTON_LAYOUT_6GAWD_B: 34,
BUTTON_LAYOUT_6GAWD_ALLBUTTON_B: 35,
BUTTON_LAYOUT_6GAWD_ALLBUTTONPLUS_B: 36,
BUTTON_LAYOUT_STICKLESS_R16B: 37,
},
});
});
Expand Down
2 changes: 2 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 @@ -20,6 +20,7 @@ export default {
BUTTON_LAYOUT_OPENCORE0WASDA: 'Open_Core0 WASD',
BUTTON_LAYOUT_STICKLESS_13: 'Stickless 13',
BUTTON_LAYOUT_STICKLESS_16: 'Stickless 16',
BUTTON_LAYOUT_STICKLESS_R16: 'Stickless R16',
BUTTON_LAYOUT_STICKLESS_14: 'Stickless 14',
BUTTON_LAYOUT_DANCEPAD_DDR_LEFT: 'DDR Dancepad Left',
BUTTON_LAYOUT_DANCEPAD_DDR_SOLO: 'DDR Dancepad Solo',
Expand Down Expand Up @@ -61,6 +62,7 @@ export default {
BUTTON_LAYOUT_OPENCORE0WASDB: 'Open_Core0 WASD',
BUTTON_LAYOUT_STICKLESS_13B: 'Stickless 13',
BUTTON_LAYOUT_STICKLESS_16B: 'Stickless 16',
BUTTON_LAYOUT_STICKLESS_R16B: 'Stickless R16',
BUTTON_LAYOUT_STICKLESS_14B: 'Stickless 14',
BUTTON_LAYOUT_DANCEPAD_DDR_RIGHT: 'DDR Dancepad Right',
BUTTON_LAYOUT_DANCEPAD_PIU_RIGHT: 'PIU Dancepad Right',
Expand Down
2 changes: 2 additions & 0 deletions www/src/Locales/zh-CN/LayoutConfig.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export default {
BUTTON_LAYOUT_OPENCORE0WASDA: 'Open_Core0 WASD',
BUTTON_LAYOUT_STICKLESS_13: 'Stickless 13',
BUTTON_LAYOUT_STICKLESS_16: 'Stickless 16',
BUTTON_LAYOUT_STICKLESS_R16: 'Stickless R16',
BUTTON_LAYOUT_STICKLESS_14: 'Stickless 14',
BUTTON_LAYOUT_DANCEPAD_DDR_LEFT: 'DDR Dancepad Left',
BUTTON_LAYOUT_DANCEPAD_DDR_SOLO: 'DDR Dancepad Solo',
Expand Down Expand Up @@ -61,6 +62,7 @@ export default {
BUTTON_LAYOUT_OPENCORE0WASDB: 'Open_Core0 WASD',
BUTTON_LAYOUT_STICKLESS_13B: 'Stickless 13',
BUTTON_LAYOUT_STICKLESS_16B: 'Stickless 16',
BUTTON_LAYOUT_STICKLESS_R16B: 'Stickless R16',
BUTTON_LAYOUT_STICKLESS_14B: 'Stickless 14',
BUTTON_LAYOUT_DANCEPAD_DDR_RIGHT: 'DDR Dancepad Right',
BUTTON_LAYOUT_DANCEPAD_PIU_RIGHT: 'PIU Dancepad Right',
Expand Down