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

ControllerInterface: make DSU inputs start from resting pose instead of 0. Add battery level

This commit is contained in:
Filoppi 2021-05-10 22:43:41 +03:00
parent 16e4dede72
commit 98b00a28e4
1 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp
View File

@ -114,7 +114,7 @@ private:
{ {
switch (m_battery) switch (m_battery)
{ {
case BatteryState::Charging: case BatteryState::Charging: // We don't actually know the battery level in this case
case BatteryState::Charged: case BatteryState::Charged:
return BATTERY_INPUT_MAX_VALUE; return BATTERY_INPUT_MAX_VALUE;
default: default:
@ -138,6 +138,8 @@ public:
std::optional<int> GetPreferredId() const final override; std::optional<int> GetPreferredId() const final override;
private: private:
void ResetPadData();
const std::string m_name; const std::string m_name;
const int m_index; const int m_index;
sf::UdpSocket m_socket; sf::UdpSocket m_socket;
@ -149,6 +151,11 @@ private:
int m_touch_y = 0; int m_touch_y = 0;
std::string m_server_address; std::string m_server_address;
u16 m_server_port; u16 m_server_port;
s16 m_touch_x_min;
s16 m_touch_y_min;
s16 m_touch_x_max;
s16 m_touch_y_max;
}; };
using MathUtil::GRAVITY_ACCELERATION; using MathUtil::GRAVITY_ACCELERATION;
@ -528,6 +535,31 @@ Device::Device(std::string name, int index, std::string server_address, u16 serv
AddInput(new GyroInput("Gyro Roll Right", m_pad_data.gyro_roll_deg_s, gyro_scale)); AddInput(new GyroInput("Gyro Roll Right", m_pad_data.gyro_roll_deg_s, gyro_scale));
AddInput(new GyroInput("Gyro Yaw Left", m_pad_data.gyro_yaw_deg_s, -gyro_scale)); AddInput(new GyroInput("Gyro Yaw Left", m_pad_data.gyro_yaw_deg_s, -gyro_scale));
AddInput(new GyroInput("Gyro Yaw Right", m_pad_data.gyro_yaw_deg_s, gyro_scale)); AddInput(new GyroInput("Gyro Yaw Right", m_pad_data.gyro_yaw_deg_s, gyro_scale));
AddInput(new BatteryInput(m_pad_data.battery_status));
m_touch_x_min = 0;
m_touch_y_min = 0;
// DS4 touchpad max values
m_touch_x_max = 1919;
m_touch_y_max = 941;
ResetPadData();
}
void Device::ResetPadData()
{
m_pad_data = Proto::MessageType::PadDataResponse{};
// Make sure they start from resting values, not from 0
m_touch_x = m_touch_x_min + ((m_touch_x_max - m_touch_x_min) / 2.0);
m_touch_y = m_touch_y_min + ((m_touch_y_max - m_touch_y_min) / 2.0);
m_pad_data.left_stick_x = 128;
m_pad_data.left_stick_y_inverted = 128;
m_pad_data.right_stick_x = 128;
m_pad_data.right_stick_y_inverted = 128;
m_pad_data.touch1.x = m_touch_x;
m_pad_data.touch1.y = m_touch_y;
} }
std::string Device::GetName() const std::string Device::GetName() const