Skip to content

fix(hid-rp): Fix switch pro resetting counter #385

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
finger563 merged 1 commit into from
Feb 25, 2025
Merged

fix(hid-rp): Fix switch pro resetting counter #385

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
12 changes: 7 additions & 5 deletions components/hid-rp/include/hid-rp-switch-pro.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,14 @@ class SwitchProGamepadInputReport : public hid::report::base<hid::report::type::

/// Reset the gamepad inputs
constexpr void reset() {
std::fill(raw_input_report, raw_input_report + sizeof(raw_input_report), 0);
uint8_t prev_counter = counter;
// fill all 0s
std::fill(raw_report, raw_report + sizeof(raw_report), 0);
// now set the counter to the previous value
counter = prev_counter;
// set the joysticks to 0 since their config may not put them at 0
set_left_joystick(0, 0);
set_right_joystick(0, 0);
set_battery_level(75);
set_battery_charging(false);
set_usb_powered(false);
}

/// Set the counter
Expand All @@ -202,7 +204,7 @@ class SwitchProGamepadInputReport : public hid::report::base<hid::report::type::

/// Increment the counter
constexpr void increment_counter() {
counter = (counter + 1) & 0x0F;
counter = (counter + 1);
}

/// Get the counter value
Expand Down