Browse Source
Merge pull request #557 from shinyquagsire23/libnx-hid-fix
hid: Update all layouts and only show handheld as connected, fixes libnx input for P1_AUTO
pull/15/merge
bunnei
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
2 deletions
-
src/core/hle/service/hid/hid.cpp
-
src/core/hle/service/hid/hid.h
|
|
|
@ -94,7 +94,6 @@ private: |
|
|
|
layout.header.latest_entry = (layout.header.latest_entry + 1) % HID_NUM_ENTRIES; |
|
|
|
|
|
|
|
ControllerInputEntry& entry = layout.entries[layout.header.latest_entry]; |
|
|
|
entry.connection_state = ConnectionState_Connected | ConnectionState_Wired; |
|
|
|
entry.timestamp++; |
|
|
|
// TODO(shinyquagsire23): Is this always identical to timestamp?
|
|
|
|
entry.timestamp_2++; |
|
|
|
@ -103,6 +102,8 @@ private: |
|
|
|
if (controller != Controller_Handheld) |
|
|
|
continue; |
|
|
|
|
|
|
|
entry.connection_state = ConnectionState_Connected | ConnectionState_Wired; |
|
|
|
|
|
|
|
// TODO(shinyquagsire23): Set up some LUTs for each layout mapping in the future?
|
|
|
|
// For now everything is just the default handheld layout, but split Joy-Con will
|
|
|
|
// rotate the face buttons and directions for certain layouts.
|
|
|
|
|
|
|
|
@ -12,7 +12,7 @@ namespace Service::HID { |
|
|
|
// Begin enums and output structs |
|
|
|
|
|
|
|
constexpr u32 HID_NUM_ENTRIES = 17; |
|
|
|
constexpr u32 HID_NUM_LAYOUTS = 2; |
|
|
|
constexpr u32 HID_NUM_LAYOUTS = 7; |
|
|
|
constexpr s32 HID_JOYSTICK_MAX = 0x8000; |
|
|
|
constexpr s32 HID_JOYSTICK_MIN = -0x8000; |
|
|
|
|
|
|
|
|