mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-22 12:21:41 +02:00
1dcc199a63
Dolphin has supported the recalibration shortcut (X+Y+Start) for quite a long while. So if someont's axises are terrible, you could easily recalibrate. Games even get the initial calibration upon boot(Most of the time). While changing over the GCAdapter code, I was testing to make sure the reset and calibration shortcuts still worked, turns out they didn't work at all. Looking in to the problem, we capture the combination properly, and we wait three seconds until we actually fire that off recalibration. The problem is for Nintendo's SDK to properly handle recalibrating, we need to send back data saying that it needs to recalibrate. On hardware this is done as part of the 64bits of data the controller sends back to us. On holding of the controller, bit 61 of the return value is set, which the Nintendo SDK catches, and then signals immediately afterwards a CMD_ORIGIN command in order to recalibrate the controller. We were outright ignoring this bit, so the library wasn't ever recalibrating. I suspect in the past the class itself used to use the calibration data to to offset the data, but somewhere along the lines it got munged out of existence. The Gamecube adapter does this shortcut in a bit of a unique way, instead of sending the command and having the library support it and what have you. Once holding the shortcut for the amount of time, the adapter reports back that the controller has actually been disconnected. Then when you let go of the combination, the adapter states that a new device has been connected to that port, and the recalibration happens because a new device is "connected." This fixes controller calibration for both emulated GC controllers and also the Wii Gamecube Adapter.
40 lines
883 B
C++
40 lines
883 B
C++
// Copyright 2010 Dolphin Emulator Project
|
|
// Licensed under GPLv2+
|
|
// Refer to the license.txt file included.
|
|
|
|
#pragma once
|
|
|
|
#include <cstddef>
|
|
#include <string>
|
|
#include <vector>
|
|
#include <wx/button.h>
|
|
#include <wx/dialog.h>
|
|
#include <wx/eventfilter.h>
|
|
#include <wx/panel.h>
|
|
#include <wx/sizer.h>
|
|
|
|
#include "Core/ConfigManager.h"
|
|
|
|
class GCAdapterConfigDiag : public wxDialog
|
|
{
|
|
public:
|
|
GCAdapterConfigDiag(wxWindow* const parent, const wxString& name, const int tab_num = 0);
|
|
~GCAdapterConfigDiag();
|
|
|
|
void ScheduleAdapterUpdate();
|
|
void UpdateAdapter(wxCommandEvent& ev);
|
|
|
|
private:
|
|
wxStaticText* m_adapter_status;
|
|
int m_pad_id;
|
|
|
|
void OnAdapterRumble(wxCommandEvent& event)
|
|
{
|
|
SConfig::GetInstance().m_AdapterRumble[m_pad_id] = event.IsChecked();
|
|
}
|
|
|
|
void OnAdapterKonga(wxCommandEvent& event)
|
|
{
|
|
SConfig::GetInstance().m_AdapterKonga[m_pad_id] = event.IsChecked();
|
|
}
|
|
};
|