piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7763 from jordan-woyak/steering-wheel-ff-fix

Browse Source 
HW: SI_Device_GCSteeringWheel: Fix handling of force commands.
This commit is contained in:
Tilka 2019-02-02 13:12:51 +00:00 committed by GitHub
commit d55e276d0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.cpp
View File

@ -81,26 +81,33 @@ void CSIDevice_GCSteeringWheel::SendCommand(u32 command, u8 poll)
if (wheel_command.command == CMD_FORCE)
{
// 0 = left strong, 127 = left weak, 128 = right weak, 255 = right strong
unsigned int strength = wheel_command.parameter1;
// 06 = motor on, 04 = motor off
unsigned int type = wheel_command.parameter2;
// get the correct pad number that should rumble locally when using netplay
const int pad_num = NetPlay_InGamePadToLocalPad(m_device_number);
if (pad_num < 4)
{
if (type == 0x06)
// Lowest bit is the high bit of the strength field.
const auto type = ForceCommandType(wheel_command.parameter2 >> 1);
// Strength is a 9 bit value from 0 to 256.
// 0 = left strong, 256 = right strong
const u32 strength = ((wheel_command.parameter2 & 1) << 8) | wheel_command.parameter1;
switch (type)
{
// map 0..255 to -1.0..1.0
ControlState mapped_strength = strength / 127.5 - 1;
case ForceCommandType::MotorOn:
{
// Map 0..256 to -1.0..1.0
const ControlState mapped_strength = strength / 128.0 - 1;
Pad::Rumble(pad_num, mapped_strength);
break;
}
else
{
case ForceCommandType::MotorOff:
Pad::Rumble(pad_num, 0);
break;
default:
WARN_LOG(SERIALINTERFACE, "Unknown CMD_FORCE type %i", int(type));
break;
}
}

6
Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.h
View File

@ -32,5 +32,11 @@ private:
CMD_FORCE = 0x30,
CMD_WRITE = 0x40
};
enum class ForceCommandType : u8
{
MotorOn = 0x03,
MotorOff = 0x02,
};
};
} // namespace SerialInterface