Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 23:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1045 from ggrtk/analog-controller

Browse source 
AnalogController: Implement legacy rumble method
This commit is contained in:
Connor McLaughlin 2020-11-08 00:13:57 +10:00 committed by GitHub
parent a17e15f176 6d4b812b7c
commit 9cf38a5740
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/core/analog_controller.cpp
View file

@ -302,6 +302,10 @@ bool AnalogController::Transfer(const u8 data_in, u8* data_out)
{ {
if (m_rumble_unlocked) if (m_rumble_unlocked)
SetMotorState(1, ((data_in & 0x01) != 0) ? 255 : 0); SetMotorState(1, ((data_in & 0x01) != 0) ? 255 : 0);
else if (data_in >= 0x40 && data_in <= 0x7F)
m_legacy_rumble_unlocked = true;
else
SetMotorState(1, 0);
*data_out = Truncate8(m_button_state) & GetExtraButtonMaskLSB(); *data_out = Truncate8(m_button_state) & GetExtraButtonMaskLSB();
m_state = State::GetStateButtonsMSB; m_state = State::GetStateButtonsMSB;
@ -313,6 +317,11 @@ bool AnalogController::Transfer(const u8 data_in, u8* data_out)
{ {
if (m_rumble_unlocked) if (m_rumble_unlocked)
SetMotorState(0, data_in); SetMotorState(0, data_in);
else if (m_legacy_rumble_unlocked)
{
SetMotorState(1, ((data_in & 0x01) != 0) ? 255 : 0);
m_legacy_rumble_unlocked = false;
}
*data_out = Truncate8(m_button_state >> 8); *data_out = Truncate8(m_button_state >> 8);
m_state = m_analog_mode ? State::GetStateRightAxisX : State::Idle; m_state = m_analog_mode ? State::GetStateRightAxisX : State::Idle;

1
src/core/analog_controller.h
View file

@ -142,6 +142,7 @@ private:
bool m_analog_mode = false; bool m_analog_mode = false;
bool m_analog_locked = false; bool m_analog_locked = false;
bool m_rumble_unlocked = false; bool m_rumble_unlocked = false;
bool m_legacy_rumble_unlocked = false;
bool m_configuration_mode = false; bool m_configuration_mode = false;
u8 m_command_param = 0; u8 m_command_param = 0;