geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only update the battery status for Bluetooth Switch Pro controllers 

Controllers that are plugged in are in the wired state
main
Sam Lantinga 2023-11-10 17:09:39 -08:00
parent 87794d03ad
commit 09d1e9defb
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/joystick/hidapi/SDL_hidapi_switch.c
View File

@ -2035,24 +2035,26 @@ static void HandleFullControllerState(SDL_Joystick *joystick, SDL_DriverSwitch_C
SDL_SendJoystickAxis(timestamp, joystick, SDL_GAMEPAD_AXIS_RIGHTY, ~axis); SDL_SendJoystickAxis(timestamp, joystick, SDL_GAMEPAD_AXIS_RIGHTY, ~axis);
} }
/* High nibble of battery/connection byte is battery level, low nibble is connection status if (ctx->device->is_bluetooth) {
* LSB of connection nibble is USB/Switch connection status /* High nibble of battery/connection byte is battery level, low nibble is connection status
*/ * LSB of connection nibble is USB/Switch connection status
if (packet->controllerState.ucBatteryAndConnection & 0x1) {
SDL_SendJoystickBatteryLevel(joystick, SDL_JOYSTICK_POWER_WIRED);
} else {
/* LSB of the battery nibble is used to report charging.
* The battery level is reported from 0(empty)-8(full)
*/ */
int level = (packet->controllerState.ucBatteryAndConnection & 0xE0) >> 4; if (packet->controllerState.ucBatteryAndConnection & 0x1) {
if (level == 0) { SDL_SendJoystickBatteryLevel(joystick, SDL_JOYSTICK_POWER_WIRED);
SDL_SendJoystickBatteryLevel(joystick, SDL_JOYSTICK_POWER_EMPTY);
} else if (level <= 2) {
SDL_SendJoystickBatteryLevel(joystick, SDL_JOYSTICK_POWER_LOW);
} else if (level <= 6) {
SDL_SendJoystickBatteryLevel(joystick, SDL_JOYSTICK_POWER_MEDIUM);
} else { } else {
SDL_SendJoystickBatteryLevel(joystick, SDL_JOYSTICK_POWER_FULL); /* LSB of the battery nibble is used to report charging.
* The battery level is reported from 0(empty)-8(full)
*/
int level = (packet->controllerState.ucBatteryAndConnection & 0xE0) >> 4;
if (level == 0) {
SDL_SendJoystickBatteryLevel(joystick, SDL_JOYSTICK_POWER_EMPTY);
} else if (level <= 2) {
SDL_SendJoystickBatteryLevel(joystick, SDL_JOYSTICK_POWER_LOW);
} else if (level <= 6) {
SDL_SendJoystickBatteryLevel(joystick, SDL_JOYSTICK_POWER_MEDIUM);
} else {
SDL_SendJoystickBatteryLevel(joystick, SDL_JOYSTICK_POWER_FULL);
}
} }
} }