izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(linux/input): don't pass unknown battery values (#2820)

Browse Source
This commit is contained in:
Cameron Gutman
2024-07-14 13:11:29 -05:00
committed by GitHub
parent d57c66fa9c
commit 5f715d66cd
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/platform/linux/input/inputtino_gamepad.cpp
View File

@@ -248,9 +248,9 @@ namespace platf::gamepad {
if (!gamepad) { if (!gamepad) {
return; return;
} }
// Only the PS5 controller supports motion // Only the PS5 controller supports battery reports
if (std::holds_alternative<inputtino::PS5Joypad>(*gamepad->joypad)) { if (std::holds_alternative<inputtino::PS5Joypad>(*gamepad->joypad)) {
inputtino::PS5Joypad::BATTERY_STATE state = inputtino::PS5Joypad::CHARGHING_ERROR; inputtino::PS5Joypad::BATTERY_STATE state;
switch (battery.state) { switch (battery.state) {
case LI_BATTERY_STATE_CHARGING: case LI_BATTERY_STATE_CHARGING:
state = inputtino::PS5Joypad::BATTERY_CHARGHING; state = inputtino::PS5Joypad::BATTERY_CHARGHING;
@@ -261,10 +261,14 @@ namespace platf::gamepad {
case LI_BATTERY_STATE_FULL: case LI_BATTERY_STATE_FULL:
state = inputtino::PS5Joypad::BATTERY_FULL; state = inputtino::PS5Joypad::BATTERY_FULL;
break; break;
case LI_BATTERY_STATE_UNKNOWN:
case LI_BATTERY_STATE_NOT_PRESENT:
default:
return;
}
if (battery.percentage != LI_BATTERY_PERCENTAGE_UNKNOWN) {
std::get<inputtino::PS5Joypad>(*gamepad->joypad).set_battery(state, battery.percentage);
} }
// Battery values in Moonlight are in the range [0, 0xFF (255)]
// Inputtino expects them as a percentage [0, 100]
std::get<inputtino::PS5Joypad>(*gamepad->joypad).set_battery(state, battery.percentage / 2.55);
} }
} }