mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-03 22:58:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Publicly expose ConvertToSensorWeight; add ConvertToKilograms

Browse source
This commit is contained in:
Pokechu22 2019-08-14 15:27:03 -07:00
commit 5331a48b0c
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/Core/Core/HW/WiimoteEmu/Extension/BalanceBoard.cpp
View file

@ -141,9 +141,6 @@ void BalanceBoardExt::LoadDefaults(const ControllerInterface& ciface)
u16 BalanceBoardExt::ConvertToSensorWeight(double weight_in_kilos) u16 BalanceBoardExt::ConvertToSensorWeight(double weight_in_kilos)
{ {
constexpr u16 LOW_WEIGHT_DELTA = WEIGHT_17_KG - WEIGHT_0_KG;
constexpr u16 HIGH_WEIGHT_DELTA = WEIGHT_34_KG - WEIGHT_17_KG;
// Note: this is the weight on a single sensor, so these ranges make more sense // Note: this is the weight on a single sensor, so these ranges make more sense
// (if all sensors read 34 kilos, then the overall weight would be 136 kilos or 300 pounds...) // (if all sensors read 34 kilos, then the overall weight would be 136 kilos or 300 pounds...)
if (weight_in_kilos < 17) if (weight_in_kilos < 17)
@ -156,6 +153,18 @@ u16 BalanceBoardExt::ConvertToSensorWeight(double weight_in_kilos)
} }
} }
double BalanceBoardExt::ConvertToKilograms(u16 sensor_weight)
{
if (sensor_weight < WEIGHT_17_KG)
{
return (sensor_weight - WEIGHT_0_KG) * 17. / LOW_WEIGHT_DELTA;
}
else
{
return (sensor_weight - WEIGHT_17_KG) * 17. / HIGH_WEIGHT_DELTA + 17.;
}
}
void BalanceBoardExt::ComputeCalibrationChecksum() void BalanceBoardExt::ComputeCalibrationChecksum()
{ {
std::array<u8, 0x1c> data; std::array<u8, 0x1c> data;

7
Source/Core/Core/HW/WiimoteEmu/Extension/BalanceBoard.h
View file

@ -52,6 +52,9 @@ public:
void LoadDefaults(const ControllerInterface& ciface) override; void LoadDefaults(const ControllerInterface& ciface) override;
static u16 ConvertToSensorWeight(double weight_in_kilos);
static double ConvertToKilograms(u16 sensor_weight);
// Use the same calibration data for all sensors. // Use the same calibration data for all sensors.
// Wii Fit internally converts to grams, but using grams for the actual values leads to // Wii Fit internally converts to grams, but using grams for the actual values leads to
// overflowing values, and also underflowing values when a sensor gets negative if balance is // overflowing values, and also underflowing values when a sensor gets negative if balance is
@ -65,9 +68,11 @@ public:
static constexpr u8 TEMPERATURE = 0x19; static constexpr u8 TEMPERATURE = 0x19;
private: private:
u16 ConvertToSensorWeight(double weight_in_kilos);
void ComputeCalibrationChecksum(); void ComputeCalibrationChecksum();
static constexpr u16 LOW_WEIGHT_DELTA = WEIGHT_17_KG - WEIGHT_0_KG;
static constexpr u16 HIGH_WEIGHT_DELTA = WEIGHT_34_KG - WEIGHT_17_KG;
ControllerEmu::AnalogStick* m_balance; ControllerEmu::AnalogStick* m_balance;
ControllerEmu::Triggers* m_weight; ControllerEmu::Triggers* m_weight;
}; };