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

Merge pull request #1540 from ggrtk/analog-controller-update

Browse Source 
AnalogController: Update behavior based on hardware testing
pull/1543/head
Connor McLaughlin 4 years ago committed by GitHub
parent c4386d6e71 2938c946f9
commit fa2cca1429
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File

56
src/core/analog_controller.cpp
Unescape Escape View File

@ -31,6 +31,7 @@ void AnalogController::Reset()
m_configuration_mode = false;
m_motor_state.fill(0);
m_rumble_unlocked = false;
ResetRumbleConfig();
if (m_force_analog_on_reset)
@ -210,6 +211,7 @@ void AnalogController::ResetTransferState()
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)
@ -263,9 +265,6 @@ u8 AnalogController::GetExtraButtonMaskLSB() const
void AnalogController::ResetRumbleConfig()
{
m_legacy_rumble_unlocked = false;
m_rumble_unlocked = false;
m_rumble_config.fill(0xFF);
m_rumble_config_large_motor_index = -1;
@ -316,7 +315,6 @@ bool AnalogController::Transfer(const u8 data_in, u8* data_out)
{
case Command::Idle:
{
// ack when sent 0x01, send ID for 0x42
if (data_in == 0x42)
{
Assert(m_command_step == 0);
@ -337,6 +335,8 @@ bool AnalogController::Transfer(const u8 data_in, u8* data_out)
m_response_length = (GetResponseNumHalfwords() + 1) * 2;
m_command = Command::SetAnalogMode;
m_tx_buffer = {GetIDByte(), GetStatusByte(), 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
ResetRumbleConfig();
}
else if (m_configuration_mode && data_in == 0x45)
{
@ -350,7 +350,7 @@ bool AnalogController::Transfer(const u8 data_in, u8* data_out)
Assert(m_command_step == 0);
m_response_length = (GetResponseNumHalfwords() + 1) * 2;
m_command = Command::Command46;
m_tx_buffer = {GetIDByte(), GetStatusByte(), 0x00, 0x00, 0x01, 0x02, 0x00, 0x0A};
m_tx_buffer = {GetIDByte(), GetStatusByte(), 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
}
else if (m_configuration_mode && data_in == 0x47)
{
@ -373,7 +373,6 @@ bool AnalogController::Transfer(const u8 data_in, u8* data_out)
m_command = Command::GetSetRumble;
m_tx_buffer = {GetIDByte(), GetStatusByte(), 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
m_rumble_unlocked = true;
m_rumble_config_large_motor_index = -1;
m_rumble_config_small_motor_index = -1;
}
@ -404,10 +403,6 @@ bool AnalogController::Transfer(const u8 data_in, u8* data_out)
if (m_rumble_unlocked)
SetMotorStateForConfigIndex(rumble_index, data_in);
else if (data_in >= 0x40 && data_in <= 0x7F)
m_legacy_rumble_unlocked = true;
else
SetMotorState(SmallMotor, 0);
}
break;
@ -419,10 +414,10 @@ bool AnalogController::Transfer(const u8 data_in, u8* data_out)
{
SetMotorStateForConfigIndex(rumble_index, data_in);
}
else if (m_legacy_rumble_unlocked)
else
{
SetMotorState(SmallMotor, ((data_in & 0x01) != 0) ? 255 : 0);
m_legacy_rumble_unlocked = false;
bool legacy_rumble_on = (m_rx_buffer[2] & 0xC0) == 0x40 && (m_rx_buffer[3] & 0x01) != 0;
SetMotorState(SmallMotor, legacy_rumble_on ? 255 : 0);
}
}
break;
@ -530,6 +525,7 @@ bool AnalogController::Transfer(const u8 data_in, u8* data_out)
if (m_command_step == (static_cast<s32>(m_response_length) - 1))
{
m_rumble_unlocked = true;
m_configuration_mode = (m_rx_buffer[2] == 1);
Log_DevPrintf("0x%02x(%s) config mode", m_rx_buffer[2], m_configuration_mode ? "enter" : "leave");
}
@ -563,18 +559,35 @@ bool AnalogController::Transfer(const u8 data_in, u8* data_out)
case Command::Command46:
{
if (m_command_step == 2 && data_in == 0x01)
if (m_command_step == 2)
{
m_tx_buffer[5] = 0x01;
m_tx_buffer[6] = 0x01;
m_tx_buffer[7] = 0x14;
if (data_in == 0x00)
{
m_tx_buffer[4] = 0x01;
m_tx_buffer[5] = 0x02;
m_tx_buffer[6] = 0x00;
m_tx_buffer[7] = 0x0A;
}
else if (data_in == 0x01)
{
m_tx_buffer[4] = 0x01;
m_tx_buffer[5] = 0x01;
m_tx_buffer[6] = 0x01;
m_tx_buffer[7] = 0x14;
}
}
}
break;
case Command::Command47:
{
// Intentionally empty, use fixed reply buffer
if (m_command_step == 2 && data_in != 0x00)
{
m_tx_buffer[4] = 0x00;
m_tx_buffer[5] = 0x00;
m_tx_buffer[6] = 0x00;
m_tx_buffer[7] = 0x00;
}
}
break;
@ -611,14 +624,7 @@ bool AnalogController::Transfer(const u8 data_in, u8* data_out)
if (m_rumble_config_small_motor_index == -1)
SetMotorState(SmallMotor, 0);
if (m_rumble_config_large_motor_index == -1 && m_rumble_config_small_motor_index == -1)
m_rumble_unlocked = false;
}
// Unknown if motor config array forces 0xFF values if configured byte is not 0x00 or 0x01
// Unknown under what circumstances rumble is locked and legacy rumble is re-enabled, if even possible
// Current assumption is that rumble is locked and legacy rumble is re-enabled when new config is all 0xFF
}
break;

4
src/core/analog_controller.h
Unescape Escape View File

@ -125,7 +125,6 @@ private:
bool m_analog_mode = false;
bool m_analog_locked = false;
bool m_rumble_unlocked = false;
bool m_legacy_rumble_unlocked = false;
bool m_configuration_mode = false;
std::array<u8, static_cast<u8>(Axis::Count)> m_axis_state{};
@ -150,6 +149,7 @@ private:
MotorState m_motor_state{};
// Member variable that is no longer used, but kept and serialized for compatibility with older save states
// Member variables that are no longer used, but kept and serialized for compatibility with older save states
u8 m_command_param = 0;
bool m_legacy_rumble_unlocked = false;
};

Write Preview
Loading…
Cancel
Save