ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AnalogController: Fix regression in analog mode toggling

This commit is contained in:
Albert Liu 2021-02-21 16:12:41 -08:00
parent 329e8317b4
commit 71d748ef04
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/core/analog_controller.cpp
View File

@ -130,7 +130,12 @@ void AnalogController::SetButtonState(Button button, bool pressed)
{
// analog toggle
if (pressed)
m_analog_toggle_queued = true;
{
if (m_command == Command::Idle)
ProcessAnalogModeToggle();
else
m_analog_toggle_queued = true;
}
return;
}
@ -197,26 +202,7 @@ void AnalogController::ResetTransferState()
{
if (m_analog_toggle_queued)
{
if (m_analog_locked)
{
g_host_interface->AddFormattedOSDMessage(
5.0f,
m_analog_mode ?
g_host_interface->TranslateString("AnalogController", "Controller %u is locked to analog mode by the game.") :
g_host_interface->TranslateString("AnalogController", "Controller %u is locked to digital mode by the game."),
m_index + 1u);
}
else
{
SetAnalogMode(!m_analog_mode);
// Manually toggling controller mode resets and disables rumble configuration
m_rumble_unlocked = false;
ResetRumbleConfig();
// TODO: Mode switch detection (0x00 returned on certain commands instead of 0x5A)
}
ProcessAnalogModeToggle();
m_analog_toggle_queued = false;
}
@ -238,6 +224,29 @@ void AnalogController::SetAnalogMode(bool enabled)
m_analog_mode = enabled;
}
void AnalogController::ProcessAnalogModeToggle()
{
if (m_analog_locked)
{
g_host_interface->AddFormattedOSDMessage(
5.0f,
m_analog_mode ?
g_host_interface->TranslateString("AnalogController", "Controller %u is locked to analog mode by the game.") :
g_host_interface->TranslateString("AnalogController", "Controller %u is locked to digital mode by the game."),
m_index + 1u);
}
else
{
SetAnalogMode(!m_analog_mode);
// Manually toggling controller mode resets and disables rumble configuration
m_rumble_unlocked = false;
ResetRumbleConfig();
// TODO: Mode switch detection (0x00 returned on certain commands instead of 0x5A)
}
}
void AnalogController::SetMotorState(u8 motor, u8 value)
{
DebugAssert(motor < NUM_MOTORS);

1
src/core/analog_controller.h
View File

@ -111,6 +111,7 @@ private:
constexpr u8 GetStatusByte() const { return 0x5A; };
void SetAnalogMode(bool enabled);
void ProcessAnalogModeToggle();
void SetMotorState(u8 motor, u8 value);
u8 GetExtraButtonMaskLSB() const;
void ResetRumbleConfig();