Skip to content

Fix button mapping for button combo detection #96

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 4 commits into from
Jan 4, 2025
Merged

Fix button mapping for button combo detection #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
402bde3
Fix button mapping for button combo detection
Maschell Jan 3, 2025
dedbd8b
Simplify trampoline reset, flush cache
Maschell Jan 3, 2025
495960d
Fix logging button combo hook
Maschell Jan 3, 2025
ce9c468
Add button combo module depedency
Maschell Jan 3, 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
4 changes: 3 additions & 1 deletion source/hooks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ static const char **hook_names = (const char *[]){
"WUPS_LOADER_HOOK_APPLICATION_REQUESTS_EXIT",
"WUPS_LOADER_HOOK_APPLICATION_ENDS",
"WUPS_LOADER_HOOK_INIT_STORAGE",
"WUPS_LOADER_HOOK_INIT_CONFIG"};
"WUPS_LOADER_HOOK_INIT_CONFIG",
"WUPS_LOADER_HOOK_INIT_BUTTON_COMBO",
};

void CallHook(const std::vector<PluginContainer> &plugins, const wups_loader_hook_type_t hook_type) {
CallHook(plugins, hook_type, [](const auto &) { return true; });
Expand Down
7 changes: 6 additions & 1 deletion source/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,15 @@
#include <coreinit/interrupts.h>
#include <coreinit/scheduler.h>

#include <coreinit/cache.h>
#include <thread>

WUMS_MODULE_EXPORT_NAME("homebrew_wupsbackend");
WUMS_USE_WUT_DEVOPTAB();
WUMS_DEPENDS_ON(homebrew_functionpatcher);
WUMS_DEPENDS_ON(homebrew_memorymapping);
WUMS_DEPENDS_ON(homebrew_notifications);
WUMS_DEPENDS_ON(homebrew_buttoncombo);

using namespace std::chrono_literals;

Expand Down Expand Up @@ -309,9 +311,12 @@ void CleanupPlugins(std::vector<PluginContainer> &&pluginsToDeinit) {
if (!pluginContainer.isLinkedAndLoaded() || cur.id != pluginContainer.getPluginLinkInformation().getTrampolineId()) {
continue;
}
cur.status = RELOC_TRAMP_FREE;
cur = {};
}
}
DCFlushRange((void *) gTrampData.data(), gTrampData.size() * sizeof(relocation_trampoline_entry_t));
ICInvalidateRange((void *) gTrampData.data(), gTrampData.size() * sizeof(relocation_trampoline_entry_t));
OSMemoryBarrier();
}
void CheckCleanupCallbackUsage(const std::vector<PluginContainer> &plugins) {
auto *curThread = OSGetCurrentThread();
Expand Down
4 changes: 2 additions & 2 deletions source/plugin/ButtonComboManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,10 @@ namespace {
res |= WUPS_BUTTON_COMBO_BUTTON_B;
}
if (other & BCMPAD_BUTTON_X) {
res |= WUPS_BUTTON_COMBO_BUTTON_B;
res |= WUPS_BUTTON_COMBO_BUTTON_X;
}
if (other & BCMPAD_BUTTON_Y) {
res |= WUPS_BUTTON_COMBO_BUTTON_B;
res |= WUPS_BUTTON_COMBO_BUTTON_Y;
}
if (other & BCMPAD_BUTTON_LEFT) {
res |= WUPS_BUTTON_COMBO_BUTTON_LEFT;
Expand Down