ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2194 from skidau/GCPad-Recalibrate 

Calibrated the GCPad even if the game does not explicitly do so.
This commit is contained in:
skidau 2015-03-10 11:42:38 +11:00
parent d92efc4a3e d7e54c36f1
commit 2e7a832c4d
3 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Source/Core/Core/HW/SI_DeviceGCController.cpp
View File

@ -26,6 +26,23 @@ CSIDevice_GCController::CSIDevice_GCController(SIDevices device, int _iDeviceNum
{ {
// Dunno if we need to do this, game/lib should set it? // Dunno if we need to do this, game/lib should set it?
m_Mode = 0x03; m_Mode = 0x03;
m_Calibrated = false;
}
void CSIDevice_GCController::Calibrate()
{
GCPadStatus pad_origin = GetPadStatus();
memset(&m_Origin, 0, sizeof(SOrigin));
m_Origin.uButton = pad_origin.button;
m_Origin.uOriginStickX = pad_origin.stickX;
m_Origin.uOriginStickY = pad_origin.stickY;
m_Origin.uSubStickStickX = pad_origin.substickX;
m_Origin.uSubStickStickY = pad_origin.substickY;
m_Origin.uTrigger_L = pad_origin.triggerLeft;
m_Origin.uTrigger_R = pad_origin.triggerRight;
m_Calibrated = true;
} }
int CSIDevice_GCController::RunBuffer(u8* _pBuffer, int _iLength) int CSIDevice_GCController::RunBuffer(u8* _pBuffer, int _iLength)
@ -61,19 +78,7 @@ int CSIDevice_GCController::RunBuffer(u8* _pBuffer, int _iLength)
{ {
INFO_LOG(SERIALINTERFACE, "PAD - Get Origin"); INFO_LOG(SERIALINTERFACE, "PAD - Get Origin");
GCPadStatus pad_origin; Calibrate();
memset(&m_Origin, 0, sizeof(SOrigin));
memset(&pad_origin, 0, sizeof(GCPadStatus));
pad_origin = GetPadStatus();
m_Origin.uButton = pad_origin.button;
m_Origin.uOriginStickX = pad_origin.stickX;
m_Origin.uOriginStickY = pad_origin.stickY;
m_Origin.uSubStickStickX = pad_origin.substickX;
m_Origin.uSubStickStickY = pad_origin.substickY;
m_Origin.uTrigger_L = pad_origin.triggerLeft;
m_Origin.uTrigger_R = pad_origin.triggerRight;
u8* pCalibration = reinterpret_cast<u8*>(&m_Origin); u8* pCalibration = reinterpret_cast<u8*>(&m_Origin);
for (int i = 0; i < (int)sizeof(SOrigin); i++) for (int i = 0; i < (int)sizeof(SOrigin); i++)
@ -87,6 +92,10 @@ int CSIDevice_GCController::RunBuffer(u8* _pBuffer, int _iLength)
case CMD_RECALIBRATE: case CMD_RECALIBRATE:
{ {
INFO_LOG(SERIALINTERFACE, "PAD - Recalibrate"); INFO_LOG(SERIALINTERFACE, "PAD - Recalibrate");
if (!m_Calibrated)
Calibrate();
u8* pCalibration = reinterpret_cast<u8*>(&m_Origin); u8* pCalibration = reinterpret_cast<u8*>(&m_Origin);
for (int i = 0; i < (int)sizeof(SOrigin); i++) for (int i = 0; i < (int)sizeof(SOrigin); i++)
{ {
@ -306,6 +315,7 @@ void CSIDevice_GCController::SendCommand(u32 _Cmd, u8 _Poll)
// Savestate support // Savestate support
void CSIDevice_GCController::DoState(PointerWrap& p) void CSIDevice_GCController::DoState(PointerWrap& p)
{ {
p.Do(m_Calibrated);
p.Do(m_Origin); p.Do(m_Origin);
p.Do(m_Mode); p.Do(m_Mode);
p.Do(m_TButtonComboStart); p.Do(m_TButtonComboStart);

5
Source/Core/Core/HW/SI_DeviceGCController.h
View File

@ -66,6 +66,8 @@ protected:
// Set on connection and (standard pad only) on button combo // Set on connection and (standard pad only) on button combo
SOrigin m_Origin; SOrigin m_Origin;
bool m_Calibrated;
// PADAnalogMode // PADAnalogMode
u8 m_Mode; u8 m_Mode;
@ -101,6 +103,9 @@ public:
// Savestate support // Savestate support
virtual void DoState(PointerWrap& p) override; virtual void DoState(PointerWrap& p) override;
private:
void Calibrate();
}; };

2
Source/Core/Core/State.cpp
View File

@ -64,7 +64,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
static std::thread g_save_thread; static std::thread g_save_thread;
// Don't forget to increase this after doing changes on the savestate system // Don't forget to increase this after doing changes on the savestate system
static const u32 STATE_VERSION = 40; static const u32 STATE_VERSION = 41;
enum enum
{ {