From a924fac0abebd56941ac173a44b49099bfd8e841 Mon Sep 17 00:00:00 2001 From: yellows8 Date: Tue, 17 Nov 2020 10:59:36 -0500 Subject: [PATCH] hid: Filled in the Gc trigger fields. --- nx/include/switch/services/hid.h | 8 ++++---- nx/source/services/hid.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nx/include/switch/services/hid.h b/nx/include/switch/services/hid.h index f59b21b9..f7153bd3 100644 --- a/nx/include/switch/services/hid.h +++ b/nx/include/switch/services/hid.h @@ -577,8 +577,8 @@ typedef struct HidNpadGcState { u64 buttons; JoystickPosition joysticks[JOYSTICK_NUM_STICKS]; u32 connectionState; - u32 unk0; - u32 unk1; + u32 l_trigger; ///< L analog trigger. Valid range: 0x0-0x7FFF. + u32 r_trigger; ///< R analog trigger. Valid range: 0x0-0x7FFF. u32 pad; } HidNpadGcState; @@ -631,8 +631,8 @@ typedef struct HidControllerLayout { /// HidNpadGcTriggerState typedef struct HidNpadGcTriggerState { u64 timestamp; - u32 unk0; - u32 unk1; + u32 l_trigger; + u32 r_trigger; } HidNpadGcTriggerState; /// HidNpadGcTriggerStateEntry diff --git a/nx/source/services/hid.c b/nx/source/services/hid.c index 82db797a..35a3ce96 100644 --- a/nx/source/services/hid.c +++ b/nx/source/services/hid.c @@ -610,8 +610,8 @@ void hidGetNpadStatesGc(u32 id, HidNpadGcState *states, size_t count, size_t *to memcpy(states[i].joysticks, tmp_entries[i].joysticks, sizeof(tmp_entries[i].joysticks)); // sdknso uses index 0 for the src here. states[i].connectionState = tmp_entries[i].connectionState; - states[i].unk0 = tmp_entries_trigger[i].unk0; - states[i].unk1 = tmp_entries_trigger[i].unk1; + states[i].l_trigger = tmp_entries_trigger[i].l_trigger; + states[i].r_trigger = tmp_entries_trigger[i].r_trigger; } }