diff options
| author | 2023-11-03 09:14:10 -0400 | |
|---|---|---|
| committer | 2023-11-03 09:14:10 -0400 | |
| commit | 3032980478e6d633ceee758fa10e194378c1a531 (patch) | |
| tree | 0ac864227fcab02f2f9abfe56dbaedd3bb94b040 /src/core/hid/emulated_controller.cpp | |
| parent | Merge pull request #11943 from liamwhite/silence-logspam (diff) | |
| parent | core: hid: Fix wrong battery values (diff) | |
| download | yuzu-3032980478e6d633ceee758fa10e194378c1a531.tar.gz yuzu-3032980478e6d633ceee758fa10e194378c1a531.tar.xz yuzu-3032980478e6d633ceee758fa10e194378c1a531.zip | |
Merge pull request #11947 from german77/battery
core: hid: Fix wrong battery values
Diffstat (limited to 'src/core/hid/emulated_controller.cpp')
| -rw-r--r-- | src/core/hid/emulated_controller.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index 2af3f06fc..8e2894449 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& callbac | |||
| 1091 | 1091 | ||
| 1092 | bool is_charging = false; | 1092 | bool is_charging = false; |
| 1093 | bool is_powered = false; | 1093 | bool is_powered = false; |
| 1094 | NpadBatteryLevel battery_level = 0; | 1094 | NpadBatteryLevel battery_level = NpadBatteryLevel::Empty; |
| 1095 | switch (controller.battery_values[index]) { | 1095 | switch (controller.battery_values[index]) { |
| 1096 | case Common::Input::BatteryLevel::Charging: | 1096 | case Common::Input::BatteryLevel::Charging: |
| 1097 | is_charging = true; | 1097 | is_charging = true; |
| 1098 | is_powered = true; | 1098 | is_powered = true; |
| 1099 | battery_level = 6; | 1099 | battery_level = NpadBatteryLevel::Full; |
| 1100 | break; | 1100 | break; |
| 1101 | case Common::Input::BatteryLevel::Medium: | 1101 | case Common::Input::BatteryLevel::Medium: |
| 1102 | battery_level = 6; | 1102 | battery_level = NpadBatteryLevel::High; |
| 1103 | break; | 1103 | break; |
| 1104 | case Common::Input::BatteryLevel::Low: | 1104 | case Common::Input::BatteryLevel::Low: |
| 1105 | battery_level = 4; | 1105 | battery_level = NpadBatteryLevel::Low; |
| 1106 | break; | 1106 | break; |
| 1107 | case Common::Input::BatteryLevel::Critical: | 1107 | case Common::Input::BatteryLevel::Critical: |
| 1108 | battery_level = 2; | 1108 | battery_level = NpadBatteryLevel::Critical; |
| 1109 | break; | 1109 | break; |
| 1110 | case Common::Input::BatteryLevel::Empty: | 1110 | case Common::Input::BatteryLevel::Empty: |
| 1111 | battery_level = 0; | 1111 | battery_level = NpadBatteryLevel::Empty; |
| 1112 | break; | 1112 | break; |
| 1113 | case Common::Input::BatteryLevel::None: | 1113 | case Common::Input::BatteryLevel::None: |
| 1114 | case Common::Input::BatteryLevel::Full: | 1114 | case Common::Input::BatteryLevel::Full: |
| 1115 | default: | 1115 | default: |
| 1116 | is_powered = true; | 1116 | is_powered = true; |
| 1117 | battery_level = 8; | 1117 | battery_level = NpadBatteryLevel::Full; |
| 1118 | break; | 1118 | break; |
| 1119 | } | 1119 | } |
| 1120 | 1120 | ||