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

WiimoteEmu: Fix battery level handling and remove old comments.

This commit is contained in:
Jordan Woyak 2019-01-04 18:18:44 -06:00
parent 6c0902ab0a
commit 3945aa6242
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
View File

@ -225,14 +225,18 @@ void Wiimote::HandleRequestStatus(const OutputReportRequestStatus&)
// Update status struct // Update status struct
m_status.extension = m_extension_port.IsDeviceConnected(); m_status.extension = m_extension_port.IsDeviceConnected();
// TODO: Battery level will break determinism in TAS/Netplay // Based on testing, old WiiLi.org docs, and WiiUse library:
// Max battery level seems to be 0xc8 (decimal 200)
constexpr u8 MAX_BATTERY_LEVEL = 0xc8;
m_status.battery = (u8)(m_battery_setting->GetValue() * MAX_BATTERY_LEVEL);
if (Core::WantsDeterminism())
{
// One less thing to break determinism:
m_status.battery = MAX_BATTERY_LEVEL;
}
// Battery levels in voltage
// 0x00 - 0x32: level 1
// 0x33 - 0x43: level 2
// 0x33 - 0x54: level 3
// 0x55 - 0xff: level 4
m_status.battery = (u8)(m_battery_setting->GetValue() * 0xff);
// Less than 0x20 triggers the low-battery flag: // Less than 0x20 triggers the low-battery flag:
m_status.battery_low = m_status.battery < 0x20; m_status.battery_low = m_status.battery < 0x20;

2
Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
View File

@ -235,7 +235,7 @@ Wiimote::Wiimote(const unsigned int index) : m_index(index)
m_options->numeric_settings.emplace_back( m_options->numeric_settings.emplace_back(
std::make_unique<ControllerEmu::NumericSetting>(_trans("Speaker Pan"), 0, -127, 127)); std::make_unique<ControllerEmu::NumericSetting>(_trans("Speaker Pan"), 0, -127, 127));
m_options->numeric_settings.emplace_back( m_options->numeric_settings.emplace_back(
m_battery_setting = new ControllerEmu::NumericSetting(_trans("Battery"), 95.0 / 100, 0, 255)); m_battery_setting = new ControllerEmu::NumericSetting(_trans("Battery"), 95.0 / 100, 0, 100));
// hotkeys // hotkeys
groups.emplace_back(m_hotkeys = new ControllerEmu::ModifySettingsButton(_trans("Hotkeys"))); groups.emplace_back(m_hotkeys = new ControllerEmu::ModifySettingsButton(_trans("Hotkeys")));