Skip to content

ButtonComboAPI: Add support for more wiimote buttons #97

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

Merged
Maschell merged 1 commit into from
Jan 4, 2025
Merged

ButtonComboAPI: Add support for more wiimote buttons #97

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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM ghcr.io/wiiu-env/devkitppc:20241128

COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20240424 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:0.8.2-dev-20241231-67b8431 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:0.8.2-dev-20250104-1569d27 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230621 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libmappedmemory:20230621 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libwupsbackend:20240425 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libnotifications:20240426 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libbuttoncombo:20241231-a2f949b /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libbuttoncombo:20250104-0663ede /artifacts $DEVKITPRO

WORKDIR project
24 changes: 24 additions & 0 deletions source/plugin/ButtonComboManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,18 @@ namespace {
if (other & WUPS_BUTTON_COMBO_BUTTON_RESERVED_BIT) {
res |= BCMPAD_BUTTON_RESERVED_BIT;
}
if (other & WUPS_BUTTON_COMBO_BUTTON_1) {
res |= BCMPAD_BUTTON_1;
}
if (other & WUPS_BUTTON_COMBO_BUTTON_2) {
res |= BCMPAD_BUTTON_2;
}
if (other & WUPS_BUTTON_COMBO_BUTTON_C) {
res |= BCMPAD_BUTTON_C;
}
if (other & WUPS_BUTTON_COMBO_BUTTON_Z) {
res |= BCMPAD_BUTTON_Z;
}
return static_cast<ButtonComboModule_Buttons>(res);
}

Expand Down Expand Up @@ -215,6 +227,18 @@ namespace {
if (other & BCMPAD_BUTTON_RESERVED_BIT) {
res |= WUPS_BUTTON_COMBO_BUTTON_RESERVED_BIT;
}
if (other & BCMPAD_BUTTON_1) {
res |= WUPS_BUTTON_COMBO_BUTTON_1;
}
if (other & BCMPAD_BUTTON_2) {
res |= WUPS_BUTTON_COMBO_BUTTON_2;
}
if (other & BCMPAD_BUTTON_C) {
res |= WUPS_BUTTON_COMBO_BUTTON_C;
}
if (other & BCMPAD_BUTTON_Z) {
res |= WUPS_BUTTON_COMBO_BUTTON_Z;
}
return static_cast<WUPSButtonCombo_Buttons>(res);
}

Expand Down