Skip to content

controller/nin: Fix NinJoyNpadDevice::NpadState #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MonsterDruide1 merged 1 commit into from
Feb 25, 2026
Merged

controller/nin: Fix NinJoyNpadDevice::NpadState #248

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions include/controller/nin/seadNinJoyNpadDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,19 @@ class NinJoyNpadDevice : public ControlDevice

static_assert(sizeof(VibrationThread) == 0x298);

struct SixAxisState
{
nn::hid::SixAxisSensorState state[16];
};
static_assert(sizeof(SixAxisState) == 0x600);

struct NpadState
{
nn::hid::NpadBaseState mState;
u8 _28[0x258];
SafeArray<nn::hid::NpadBaseState, 16> mStates;
s32 mSixAxisDeviceNum;
s32 mVibrationDeviceNum;
SafeArray<nn::hid::SixAxisSensorHandle, 2> mSixAxisSensorHandles;
SafeArray<nn::hid::SixAxisSensorState, 2> mSixAxisSensorStates;
u8 _288[0xb40];
SafeArray<SixAxisState, 2> mSixAxisSensorStates;
SafeArray<nn::hid::VibrationDeviceHandle, 2> mVibrationDeviceHandles;
};

Expand All @@ -63,6 +67,8 @@ class NinJoyNpadDevice : public ControlDevice
void disconnectNpad(s32);
void sendVibrationValue(s32, s32, const nn::hid::VibrationValue&);

nn::hid::NpadJoyHoldType getNpadJoyHoldType() const { return mNpadJoyHoldType; }

const NpadState& getNpadState(s32 idx) { return mNpadStates[idx]; }

private:
Expand Down