nick/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-02-07 19:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #115114 from ThiLelito/ns_controller_led

Browse Source 
Add support for the Home LED on NS Controllers
This commit is contained in:
Thaddeus Crews
2026-01-27 09:04:11 -06:00
parent 7630566159 6ff5f449a9
commit 2da55b2f29
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/sdl/joypad_sdl.cpp
View File

@@ -292,7 +292,8 @@ void JoypadSDL::close_joypad(int p_pad_idx) {
}
bool JoypadSDL::Joypad::has_joy_light() const {
SDL_PropertiesID properties_id = SDL_GetJoystickProperties(get_sdl_joystick());
SDL_Joystick *joystick = get_sdl_joystick();
SDL_PropertiesID properties_id = SDL_GetJoystickProperties(joystick);
if (properties_id == 0) {
return false;
}

10
thirdparty/sdl/joystick/hidapi/SDL_hidapi_switch.c vendored
View File

@@ -1780,16 +1780,24 @@ static Uint32 HIDAPI_DriverSwitch_GetJoystickCapabilities(SDL_HIDAPI_Device *dev
if (ctx->m_eControllerType == k_eSwitchDeviceInfoControllerType_ProController && !ctx->m_bInputOnly) {
// Doesn't have an RGB LED, so don't return SDL_JOYSTICK_CAP_RGB_LED here
result |= SDL_JOYSTICK_CAP_RUMBLE;
// But has the HOME LED, so
result |= SDL_JOYSTICK_CAP_MONO_LED;
} else if (ctx->m_eControllerType == k_eSwitchDeviceInfoControllerType_JoyConLeft ||
ctx->m_eControllerType == k_eSwitchDeviceInfoControllerType_JoyConRight) {
result |= SDL_JOYSTICK_CAP_RUMBLE;
if (ctx->m_eControllerType == k_eSwitchDeviceInfoControllerType_JoyConRight) {
result |= SDL_JOYSTICK_CAP_MONO_LED; // Those types of controllers also have the Home LED.
}
}
return result;
}
static bool HIDAPI_DriverSwitch_SetJoystickLED(SDL_HIDAPI_Device *device, SDL_Joystick *joystick, Uint8 red, Uint8 green, Uint8 blue)
{
return SDL_Unsupported();
SDL_DriverSwitch_Context *ctx = (SDL_DriverSwitch_Context *)device->context;
int value = (int)((SDL_max(red, SDL_max(green, blue)) / 255.0f) * 100.0f); // The colors are received between 0-255 and we need them to be 0-100.
return SetHomeLED(ctx, (Uint8)value);
}
static bool HIDAPI_DriverSwitch_SendJoystickEffect(SDL_HIDAPI_Device *device, SDL_Joystick *joystick, const void *data, int size)