Skip to content
Permalink
Browse files

Merge pull request #7942 from jordan-woyak/gc-adapter-calib-fix

HW/SI: GCAdapter calibration fix.
  • Loading branch information...
JMC47 committed Mar 30, 2019
2 parents 5a10707 + a015851 commit 0bce1c509de46e3be3eeef732f264f1b17e3e333
@@ -18,6 +18,9 @@ namespace SerialInterface
CSIDevice_GCAdapter::CSIDevice_GCAdapter(SIDevices device, int device_number)
: CSIDevice_GCController(device, device_number)
{
// Make sure PAD_GET_ORIGIN gets set due to a newly connected device.
GCAdapter::ResetDeviceType(m_device_number);

// 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)
@@ -485,6 +485,11 @@ bool DeviceConnected(int chan)
return s_controller_type[chan] != ControllerTypes::CONTROLLER_NONE;
}

void ResetDeviceType(int chan)
{
s_controller_type[chan] = ControllerTypes::CONTROLLER_NONE;
}

bool UseAdapter()
{
const auto& si_devices = SConfig::GetInstance().m_SIDevice;
@@ -29,6 +29,7 @@ void Output(int chan, u8 rumble_command);
bool IsDetected();
bool IsDriverDetected();
bool DeviceConnected(int chan);
void ResetDeviceType(int chan);
bool UseAdapter();

} // end of namespace GCAdapter
@@ -382,6 +382,11 @@ bool DeviceConnected(int chan)
return s_controller_type[chan] != ControllerTypes::CONTROLLER_NONE;
}

void ResetDeviceType(int chan)
{
s_controller_type[chan] = ControllerTypes::CONTROLLER_NONE;
}

bool UseAdapter()
{
const auto& si_devices = SConfig::GetInstance().m_SIDevice;

0 comments on commit 0bce1c5

Please sign in to comment.
You can’t perform that action at this time.