Skip to content

Fix button combos after using combo detection, fix updating meta options update some logging #6

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

Fix button combos after using combo detection, fix updating meta options update some logging #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c285d98
Fix return value of setMetaOptions
Maschell Jan 12, 2025
067aba4
Properly re-enable button combo detection when exiting the combo dete…
Maschell Jan 12, 2025
45120c2
Fixed some logging strings
Maschell Jan 12, 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: 2 additions & 2 deletions source/ButtonComboInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ const std::string &ButtonComboInfoIF::getLabel() const {

bool ButtonComboInfoIF::getMetaOptions(const ButtonComboModule_MetaOptionsOut &outMeta) const {
if (outMeta.labelBuffer == nullptr || outMeta.labelBufferLength == 0) {
return true;
return false;
}

snprintf(outMeta.labelBuffer, outMeta.labelBufferLength, mLabel.c_str());

return false;
return true;
}

void ButtonComboInfoIF::setMetaOptions(const ButtonComboModule_MetaOptions options) {
Expand Down
4 changes: 2 additions & 2 deletions source/ButtonComboInfoHold.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ ButtonComboInfoHold::ButtonComboInfoHold(std::string label,
context,
observer),
mTargetDurationInMs(targetDurationInMs) {
DEBUG_FUNCTION_LINE_INFO("Created ButtonComboInfoDown: \"%s\", combo: %08X, targetDurationInMs: %d ms, controllerMask: %08X", mLabel.c_str(), mCombo, mTargetDurationInMs, mControllerMask);
DEBUG_FUNCTION_LINE_INFO("Created ButtonComboInfoHold: \"%s\", combo: %08X, targetDurationInMs: %d ms, controllerMask: %08X", mLabel.c_str(), mCombo, mTargetDurationInMs, mControllerMask);
}

ButtonComboInfoHold::~ButtonComboInfoHold() {
DEBUG_FUNCTION_LINE_INFO("Deleted ButtonComboInfoDown: \"%s\", combo: %08X, targetDurationInMs: %d ms, controllerMask: %08X", mLabel.c_str(), mCombo, mTargetDurationInMs, mControllerMask);
DEBUG_FUNCTION_LINE_INFO("Deleted ButtonComboInfoHold: \"%s\", combo: %08X, targetDurationInMs: %d ms, controllerMask: %08X", mLabel.c_str(), mCombo, mTargetDurationInMs, mControllerMask);
}

void ButtonComboInfoHold::UpdateInput(const ButtonComboModule_ControllerTypes controller, const std::span<uint32_t> pressedButtons) {
Expand Down
2 changes: 1 addition & 1 deletion source/ButtonComboManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ ButtonComboModule_Error ButtonComboManager::DetectButtonCombo_Blocking(const But
if (doShutdownKPAD) {
KPADShutdown();
}
mInButtonComboDetection = true;
mInButtonComboDetection = false;

return result;
}