VERY experimental Nintendo Switch 2 emulator
C++
core: hid: Fix wrong battery values
german77f91fbf463f87
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cppindex 2af3f06fc2..8e2894449c 100644--- a/src/core/hid/emulated_controller.cpp+++ b/src/core/hid/emulated_controller.cpp@@ -1091,30 +1091,30 @@ void EmulatedController::SetBattery(const Common::Input::CallbackStatus& callbacbool is_charging = false;bool is_powered = false;- NpadBatteryLevel battery_level = 0;+ NpadBatteryLevel battery_level = NpadBatteryLevel::Empty;switch (controller.battery_values[index]) {case Common::Input::BatteryLevel::Charging:is_charging = true;is_powered = true;- battery_level = 6;+ battery_level = NpadBatteryLevel::Full;break;case Common::Input::BatteryLevel::Medium:- battery_level = 6;+ battery_level = NpadBatteryLevel::High;break;case Common::Input::BatteryLevel::Low:- battery_level = 4;+ battery_level = NpadBatteryLevel::Low;break;case Common::Input::BatteryLevel::Critical:- battery_level = 2;+ battery_level = NpadBatteryLevel::Critical;break;case Common::Input::BatteryLevel::Empty:- battery_level = 0;+ battery_level = NpadBatteryLevel::Empty;break;case Common::Input::BatteryLevel::None:case Common::Input::BatteryLevel::Full:default:is_powered = true;- battery_level = 8;+ battery_level = NpadBatteryLevel::Full;break;}diff --git a/src/core/hid/hid_types.h b/src/core/hid/hid_types.hindex 00beb40dd6..7ba75a50cd 100644--- a/src/core/hid/hid_types.h+++ b/src/core/hid/hid_types.h@@ -302,6 +302,15 @@ enum class TouchScreenModeForNx : u8 {Heat2,};+// This is nn::hid::system::NpadBatteryLevel+enum class NpadBatteryLevel : u32 {+ Empty,+ Critical,+ Low,+ High,+ Full,+};+// This is nn::hid::NpadStyleTagstruct NpadStyleTag {union {@@ -385,16 +394,12 @@ struct NpadGcTriggerState {};static_assert(sizeof(NpadGcTriggerState) == 0x10, "NpadGcTriggerState is an invalid size");-// This is nn::hid::system::NpadBatteryLevel-using NpadBatteryLevel = u32;-static_assert(sizeof(NpadBatteryLevel) == 0x4, "NpadBatteryLevel is an invalid size");-// This is nn::hid::system::NpadPowerInfostruct NpadPowerInfo {bool is_powered{};bool is_charging{};INSERT_PADDING_BYTES(0x6);- NpadBatteryLevel battery_level{8};+ NpadBatteryLevel battery_level{NpadBatteryLevel::Full};};static_assert(sizeof(NpadPowerInfo) == 0xC, "NpadPowerInfo is an invalid size");diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cppindex bc822f19e6..21695bda29 100644--- a/src/core/hle/service/hid/controllers/npad.cpp+++ b/src/core/hle/service/hid/controllers/npad.cpp@@ -1108,9 +1108,9 @@ Result Controller_NPad::DisconnectNpad(Core::HID::NpadIdType npad_id) {shared_memory->sixaxis_dual_right_properties.raw = 0;shared_memory->sixaxis_left_properties.raw = 0;shared_memory->sixaxis_right_properties.raw = 0;- shared_memory->battery_level_dual = 0;- shared_memory->battery_level_left = 0;- shared_memory->battery_level_right = 0;+ shared_memory->battery_level_dual = Core::HID::NpadBatteryLevel::Empty;+ shared_memory->battery_level_left = Core::HID::NpadBatteryLevel::Empty;+ shared_memory->battery_level_right = Core::HID::NpadBatteryLevel::Empty;shared_memory->fullkey_color = {.attribute = ColorAttribute::NoController,.fullkey = {},