From 30f55a5d59342e04eb8a2301955097a911be6f45 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Tue, 6 Sep 2022 23:33:55 -0700
Subject: [PATCH] Added initial support for the Wii Motion Plus extension
This adds a gyro sensor to the Wii controller, and is enabled in standalone and nunchuk mode
---
src/joystick/SDL_gamecontroller.c | 5 +-
src/joystick/hidapi/SDL_hidapi_nintendo.h | 7 +-
src/joystick/hidapi/SDL_hidapi_wii.c | 692 +++++++++++++++-------
3 files changed, 495 insertions(+), 209 deletions(-)
diff --git a/src/joystick/SDL_gamecontroller.c b/src/joystick/SDL_gamecontroller.c
index d2e49c51dac..93a3e28fdf0 100644
--- a/src/joystick/SDL_gamecontroller.c
+++ b/src/joystick/SDL_gamecontroller.c
@@ -574,8 +574,7 @@ static ControllerMapping_t *SDL_CreateMappingForHIDAPIController(SDL_JoystickGUI
} else if (vendor == USB_VENDOR_NINTENDO &&
guid.data[15] != k_eSwitchDeviceInfoControllerType_Unknown &&
guid.data[15] != k_eSwitchDeviceInfoControllerType_ProController &&
- guid.data[15] != k_eWiiExtensionControllerType_ClassicController &&
- guid.data[15] != k_eWiiExtensionControllerType_ClassicControllerPro &&
+ guid.data[15] != k_eWiiExtensionControllerType_Gamepad &&
guid.data[15] != k_eWiiExtensionControllerType_WiiUPro) {
switch (guid.data[15]) {
case k_eSwitchDeviceInfoControllerType_NESLeft:
@@ -594,7 +593,7 @@ static ControllerMapping_t *SDL_CreateMappingForHIDAPIController(SDL_JoystickGUI
case k_eWiiExtensionControllerType_None:
SDL_strlcat(mapping_string, "a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,start:b6,x:b2,y:b3,", sizeof(mapping_string));
break;
- case k_eWiiExtensionControllerType_Nunchuck:
+ case k_eWiiExtensionControllerType_Nunchuk:
{
/* FIXME: Should we map this to the left or right side? */
const SDL_bool map_nunchuck_left_side = SDL_TRUE;
diff --git a/src/joystick/hidapi/SDL_hidapi_nintendo.h b/src/joystick/hidapi/SDL_hidapi_nintendo.h
index 600f3227db1..e95d5b4af1d 100644
--- a/src/joystick/hidapi/SDL_hidapi_nintendo.h
+++ b/src/joystick/hidapi/SDL_hidapi_nintendo.h
@@ -38,10 +38,9 @@ typedef enum {
typedef enum {
k_eWiiExtensionControllerType_Unknown = 0,
k_eWiiExtensionControllerType_None = 128,
- k_eWiiExtensionControllerType_Nunchuck = 129,
- k_eWiiExtensionControllerType_ClassicController = 130,
- k_eWiiExtensionControllerType_ClassicControllerPro = 131,
- k_eWiiExtensionControllerType_WiiUPro = 132,
+ k_eWiiExtensionControllerType_Nunchuk = 129,
+ k_eWiiExtensionControllerType_Gamepad = 130,
+ k_eWiiExtensionControllerType_WiiUPro = 131,
} EWiiExtensionControllerType;
/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_wii.c b/src/joystick/hidapi/SDL_hidapi_wii.c
index fdb24b94169..b000a036f96 100644
--- a/src/joystick/hidapi/SDL_hidapi_wii.c
+++ b/src/joystick/hidapi/SDL_hidapi_wii.c
@@ -38,9 +38,25 @@
/* Define this if you want to log all packets from the controller */
/*#define DEBUG_WII_PROTOCOL*/
+//#define DEBUG_WII_PROTOCOL
+
+#define INPUT_WAIT_TIMEOUT_MS (3 * 1000)
+#define MOTION_PLUS_UPDATE_TIME_MS (8 * 1000)
+#define STATUS_UPDATE_TIME_MS (15 * 60 * 1000)
+
+#define WII_EXTENSION_NONE 0x2E2E
+#define WII_EXTENSION_UNINITIALIZED 0xFFFF
+#define WII_EXTENSION_NUNCHUK 0x0000
+#define WII_EXTENSION_GAMEPAD 0x0101
+#define WII_EXTENSION_WIIUPRO 0x0120
+#define WII_EXTENSION_MOTIONPLUS_MASK 0xF0FF
+#define WII_EXTENSION_MOTIONPLUS_ID 0x0005
+
+#define WII_MOTIONPLUS_MODE_NONE 0x00
+#define WII_MOTIONPLUS_MODE_STANDARD 0x04
+#define WII_MOTIONPLUS_MODE_NUNCHUK 0x05
+#define WII_MOTIONPLUS_MODE_GAMEPAD 0x07
-#undef clamp
-#define clamp(val, min, max) (((val) > (max)) ? (max) : (((val) < (min)) ? (min) : (val)))
typedef enum {
k_eWiiInputReportIDs_Status = 0x20,
@@ -81,11 +97,9 @@ typedef enum {
} EWiiPlayerLEDs;
typedef enum {
- k_eWiiCommunicationState_None, /* No special communications happening */
- k_eWiiCommunicationState_Error, /* Special communications failed, controller communications may be broken */
- k_eWiiCommunicationState_ExtensionIdentify1, /* Sent first write for requesting extension info, awaiting ack to send second */
- k_eWiiCommunicationState_ExtensionIdentify2, /* Sent second write for requesting extension info, awaiting ack to send read */
- k_eWiiCommunicationState_ExtensionIdentify3, /* Sent read request for extension info, awaiting response */
+ k_eWiiCommunicationState_None, /* No special communications happening */
+ k_eWiiCommunicationState_CheckMotionPlusStage1, /* Sent standard extension identify request */
+ k_eWiiCommunicationState_CheckMotionPlusStage2, /* Sent Motion Plus extension identify request */
} EWiiCommunicationState;
typedef enum {
@@ -122,10 +136,13 @@ typedef struct {
SDL_bool m_bPlayerLights;
int m_nPlayerIndex;
SDL_bool m_bRumbleActive;
+ SDL_bool m_bMotionPlusPresent;
+ Uint8 m_ucMotionPlusMode;
SDL_bool m_bReportSensors;
Uint8 m_rgucReadBuffer[k_unWiiPacketDataLength];
Uint32 m_unLastInput;
Uint32 m_unLastStatus;
+ Uint32 m_unNextMotionPlusCheck;
SDL_bool m_bDisconnected;
struct StickCalibrationData {
@@ -294,72 +311,185 @@ static SDL_bool ReadRegister(SDL_DriverWii_Context *ctx, Uint32 address, int siz
return SDL_TRUE;
}
-static SDL_bool SendExtensionIdentify1(SDL_DriverWii_Context *ctx, SDL_bool sync)
-{
- Uint8 data = 0x55;
- return WriteRegister(ctx, 0xA400F0, &data, sizeof(data), sync);
-}
-
-static SDL_bool SendExtensionIdentify2(SDL_DriverWii_Context *ctx, SDL_bool sync)
+static SDL_bool SendExtensionIdentify(SDL_DriverWii_Context *ctx, SDL_bool sync)
{
- Uint8 data = 0x00;
- return WriteRegister(ctx, 0xA400FB, &data, sizeof(data), sync);
+ return ReadRegister(ctx, 0xA400FE, 2, sync);
}
-static SDL_bool SendExtensionIdentify3(SDL_DriverWii_Context *ctx, SDL_bool sync)
+static SDL_bool ParseExtensionIdentifyResponse(SDL_DriverWii_Context *ctx, Uint16 *extension)
{
- return ReadRegister(ctx, 0xA400FA, 6, sync);
-}
-
-static SDL_bool ParseExtensionResponse(SDL_DriverWii_Context *ctx, EWiiExtensionControllerType *extension_type)
-{
- Uint64 type = 0;
int i;
- *extension_type = k_eWiiExtensionControllerType_Unknown;
-
if (ctx->m_rgucReadBuffer[0] != k_eWiiInputReportIDs_ReadMemory) {
SDL_SetError("Unexpected extension response type");
return SDL_FALSE;
}
- if (ctx->m_rgucReadBuffer[4] != 0x00 || ctx->m_rgucReadBuffer[5] != 0xFA) {
+
+ if (ctx->m_rgucReadBuffer[4] != 0x00 || ctx->m_rgucReadBuffer[5] != 0xFE) {
SDL_SetError("Unexpected extension response address");
return SDL_FALSE;
}
- if (ctx->m_rgucReadBuffer[3] != 0x50) {
- if (ctx->m_rgucReadBuffer[3] & 0xF) {
- SDL_SetError("Failed to read extension type: %d", ctx->m_rgucReadBuffer[3] & 0xF);
+
+ if (ctx->m_rgucReadBuffer[3] != 0x10) {
+ Uint8 error = (ctx->m_rgucReadBuffer[3] & 0xF);
+
+ if (error == 7) {
+ /* The extension memory isn't mapped */
+ *extension = WII_EXTENSION_NONE;
+ return SDL_TRUE;
+ }
+
+ if (error) {
+ SDL_SetError("Failed to read extension type: %d", error);
} else {
SDL_SetError("Unexpected read length when reading extension type: %d", (ctx->m_rgucReadBuffer[3] >> 4) + 1);
}
return SDL_FALSE;
}
- for (i = 6; i < 12; i++) {
- type = type << 8 | ctx->m_rgucReadBuffer[i];
+ *extension = 0;
+ for (i = 6; i < 8; i++) {
+ *extension = *extension << 8 | ctx->m_rgucReadBuffer[i];
}
+ return SDL_TRUE;
+}
- if (type == 0x0000A4200000) {
- *extension_type = k_eWiiExtensionControllerType_Nunchuck;
- return SDL_TRUE;
+static EWiiExtensionControllerType GetExtensionType(Uint16 extension_id)
+{
+ switch (extension_id) {
+ case WII_EXTENSION_NONE:
+ return k_eWiiExtensionControllerType_None;
+ case WII_EXTENSION_NUNCHUK:
+ return k_eWiiExtensionControllerType_Nunchuk;
+ case WII_EXTENSION_GAMEPAD:
+ return k_eWiiExtensionControllerType_Gamepad;
+ case WII_EXTENSION_WIIUPRO:
+ return k_eWiiExtensionControllerType_WiiUPro;
+ default:
+ return k_eWiiExtensionControllerType_Unknown;
}
- if (type == 0x0000A4200101) {
- *extension_type = k_eWiiExtensionControllerType_ClassicController;
- return SDL_TRUE;
+}
+
+static SDL_bool SendExtensionReset(SDL_DriverWii_Context *ctx, SDL_bool sync)
+{
+ SDL_bool result = SDL_TRUE;
+ {
+ Uint8 data = 0x55;
+ result = result && WriteRegister(ctx, 0xA400F0, &data, sizeof(data), sync);
+ }
+ /* This write will fail if there is no extension connected, that's fine */
+ {
+ Uint8 data = 0x00;
+ (void)WriteRegister(ctx, 0xA400FB, &data, sizeof(data), sync);
}
- if (type == 0x0100A4200101) {
- *extension_type = k_eWiiExtensionControllerType_ClassicControllerPro;
+ return result;
+}
+
+static SDL_bool GetMotionPlusState(SDL_DriverWii_Context *ctx, SDL_bool *connected, Uint8 *mode)
+{
+ Uint16 extension;
+
+ if (connected) {
+ *connected = SDL_FALSE;
+ }
+ if (mode) {
+ *mode = 0;
+ }
+
+ if (ctx->m_eExtensionControllerType == k_eWiiExtensionControllerType_WiiUPro) {
+ /* The Wii U Pro controller never has the Motion Plus extension */
return SDL_TRUE;
}
- if (type == 0x0000A4200120) {
- *extension_type = k_eWiiExtensionControllerType_WiiUPro;
+
+ if (SendExtensionIdentify(ctx, SDL_TRUE) &&
+ ParseExtensionIdentifyResponse(ctx, &extension)) {
+ if ((extension & WII_EXTENSION_MOTIONPLUS_MASK) == WII_EXTENSION_MOTIONPLUS_ID) {
+ /* Motion Plus is currently active */
+ if (connected) {
+ *connected = SDL_TRUE;
+ }
+ if (mode) {
+ *mode = (extension >> 8);
+ }
+ return SDL_TRUE;
+ }
+ }
+
+ if (ReadRegister(ctx, 0xA600FE, 2, SDL_TRUE) &&
+ ParseExtensionIdentifyResponse(ctx, &extension)) {
+ if ((extension & WII_EXTENSION_MOTIONPLUS_MASK) == WII_EXTENSION_MOTIONPLUS_ID) {
+ /* Motion Plus is currently connected */
+ if (connected) {
+ *connected = SDL_TRUE;
+ }
+ }
return SDL_TRUE;
}
- SDL_SetError("Unrecognized controller type: %012" SDL_PRIx64, type);
+ /* Failed to read the register or parse the response */
return SDL_FALSE;
}
+static SDL_bool NeedsPeriodicMotionPlusCheck(SDL_DriverWii_Context *ctx, SDL_bool status_update)
+{
+ if (ctx->m_eExtensionControllerType == k_eWiiExtensionControllerType_WiiUPro) {
+ /* The Wii U Pro controller never has the Motion Plus extension */
+ return SDL_FALSE;
+ }
+
+ if (ctx->m_ucMotionPlusMode != WII_MOTIONPLUS_MODE_NONE && !status_update) {
+ /* We'll get a status update when Motion Plus is disconnected */
+ return SDL_FALSE;
+ }
+
+ return SDL_TRUE;
+}
+
+static void SchedulePeriodicMotionPlusCheck(SDL_DriverWii_Context *ctx)
+{
+ ctx->m_unNextMotionPlusCheck = SDL_GetTicks() + MOTION_PLUS_UPDATE_TIME_MS;
+ if (!ctx->m_unNextMotionPlusCheck) {
+ ctx->m_unNextMotionPlusCheck = 1;
+ }
+}
+
+static void CheckMotionPlusConnection(SDL_DriverWii_Context *ctx)
+{
+ SendExtensionIdentify(ctx, SDL_FALSE);
+
+ ctx->m_eCommState = k_eWiiCommunicationState_CheckMotionPlusStage1;
+}
+
+static void ActivateMotionPlusWithMode(SDL_DriverWii_Context *ctx, Uint8 mode)
+{
+ WriteRegister(ctx, 0xA600FE, &mode, sizeof(mode), SDL_TRUE);
+
+ ctx->m_ucMotionPlusMode = mode;
+}
+
+static void ActivateMotionPlus(SDL_DriverWii_Context *ctx)
+{
+ Uint8 mode = WII_MOTIONPLUS_MODE_STANDARD;
+
+ /* Pick the pass-through mode based on the connected controller */
+ if (ctx->m_eExtensionControllerType == k_eWiiExtensionControllerType_Nunchuk) {
+ mode = WII_MOTIONPLUS_MODE_NUNCHUK;
+ } else if (ctx->m_eExtensionControllerType == k_eWiiExtensionControllerType_Gamepad) {
+ mode = WII_MOTIONPLUS_MODE_GAMEPAD;
+ }
+ ActivateMotionPlusWithMode(ctx, mode);
+}
+
+static void DeactivateMotionPlus(SDL_DriverWii_Context *ctx)
+{
+ Uint8 data = 0x55;
+ WriteRegister(ctx, 0xA400F0, &data, sizeof(data), SDL_TRUE);
+
+ /* Wait for the deactivation status message */
+ ReadInputSync(ctx, k_eWiiInputReportIDs_Status, NULL);
+
+ ctx->m_ucMotionPlusMode = WII_MOTIONPLUS_MODE_NONE;
+}
static void UpdatePowerLevelWii(SDL_Joystick *joystick, Uint8 batteryLevelByte)
{
@@ -404,13 +534,16 @@ static EWiiInputReportIDs GetButtonPacketType(SDL_DriverWii_Context *ctx)
switch (ctx->m_eExtensionControllerType) {
case k_eWiiExtensionControllerType_WiiUPro:
return k_eWiiInputReportIDs_ButtonDataD;
- case k_eWiiExtensionControllerType_Nunchuck:
- case k_eWiiExtensionControllerType_ClassicController:
- case k_eWiiExtensionControllerType_ClassicControllerPro:
- return k_eWiiInputReportIDs_ButtonData2;
+ case k_eWiiExtensionControllerType_Nunchuk:
+ case k_eWiiExtensionControllerType_Gamepad:
+ if (ctx->m_bReportSensors) {
+ return k_eWiiInputReportIDs_ButtonData5;
+ } else {
+ return k_eWiiInputReportIDs_ButtonData2;
+ }
default:
if (ctx->m_bReportSensors) {
- return k_eWiiInputReportIDs_ButtonData1;
+ return k_eWiiInputReportIDs_ButtonData5;
} else {
return k_eWiiInputReportIDs_ButtonData0;
}
@@ -434,6 +567,11 @@ static SDL_bool RequestButtonPacketType(SDL_DriverWii_Context *ctx, EWiiInputRep
return WriteOutput(ctx, data, sizeof(data), SDL_FALSE);
}
+static void ResetButtonPacketType(SDL_DriverWii_Context *ctx)
+{
+ RequestButtonPacketType(ctx, GetButtonPacketType(ctx));
+}
+
static void InitStickCalibrationData(SDL_DriverWii_Context *ctx)
{
int i;
@@ -446,8 +584,7 @@ static void InitStickCalibrationData(SDL_DriverWii_Context *ctx)
ctx->m_StickCalibrationData[i].deadzone = 100;
}
break;
- case k_eWiiExtensionControllerType_ClassicController:
- case k_eWiiExtensionControllerType_ClassicControllerPro:
+ case k_eWiiExtensionControllerType_Gamepad:
for (i = 0; i < 4; i++) {
ctx->m_StickCalibrationData[i].min = i < 2 ? 9 : 5;
ctx->m_StickCalibrationData[i].max = i < 2 ? 54 : 26;
@@ -455,7 +592,7 @@ static void InitStickCalibrationData(SDL_DriverWii_Context *ctx)
ctx->m_StickCalibrationData[i].deadzone = i < 2 ? 4 : 2;
}
break;
- case k_eWiiExtensionControllerType_Nunchuck:
+ case k_eWiiExtensionControllerType_Nunchuk:
for (i = 0; i < 2; i++) {
ctx->m_StickCalibrationData[i].min = 40;
ctx->m_StickCalibrationData[i].max = 215;
@@ -470,8 +607,9 @@ static void InitStickCalibrationData(SDL_DriverWii_Context *ctx)
static void InitializeExtension(SDL_DriverWii_Context *ctx)
{
+ SendExtensionReset(ctx, SDL_TRUE);
InitStickCalibrationData(ctx);
- RequestButtonPacketType(ctx, GetButtonPacketType(ctx));
+ ResetButtonPacketType(ctx);
}
static void SDLCALL SDL_GameControllerButtonReportingHintChanged(void *userdata, const char *name, const char *oldValue, const char *hint)
@@ -540,23 +678,26 @@ ReadExtensionControllerType(SDL_HIDAPI_Device *device)
const int MAX_ATTEMPTS = 20;
int attempts = 0;
for (attempts = 0; attempts < MAX_ATTEMPTS; ++attempts) {
- const Uint8 statusRequest[2] = { k_eWiiOutputReportIDs_StatusRequest, 0 };
- WriteOutput(ctx, statusRequest, sizeof(statusRequest), SDL_TRUE);
- if (ReadInputSync(ctx, k_eWiiInputReportIDs_Status, NULL)) {
- SDL_bool hasExtension = (ctx->m_rgucReadBuffer[3] & 2) ? SDL_TRUE : SDL_FALSE;
- if (hasExtension) {
- /* http://wiibrew.org/wiki/Wiimote/Extension_Controllers#The_New_Way */
- if (SendExtensionIdentify1(ctx, SDL_TRUE) &&
- SendExtensionIdentify2(ctx, SDL_TRUE) &&
- SendExtensionIdentify3(ctx, SDL_TRUE)) {
- ParseExtensionResponse(ctx, &eExtensionControllerType);
+ Uint16 extension;
+ if (SendExtensionIdentify(ctx, SDL_TRUE) &&
+ ParseExtensionIdentifyResponse(ctx, &extension)) {
+ Uint8 motion_plus_mode = 0;
+ if ((extension & WII_EXTENSION_MOTIONPLUS_MASK) == WII_EXTENSION_MOTIONPLUS_ID) {
+ motion_plus_mode = (Uint8)(extension >> 8);
+ }
+ if (motion_plus_mode || extension == WII_EXTENSION_UNINITIALIZED) {
+ SendExtensionReset(ctx, SDL_TRUE);
+ if (SendExtensionIdentify(ctx, SDL_TRUE)) {
+ ParseExtensionIdentifyResponse(ctx, &extension);
}
- } else {
- eExtensionControllerType = k_eWiiExtensionControllerType_None;
}
- }
- if (eExtensionControllerType != k_eWiiExtensionControllerType_Unknown) {
- /* Got it! */
+
+ eExtensionControllerType = GetExtensionType(extension);
+
+ /* Reset the Motion Plus controller if needed */
+ if (motion_plus_mode) {
+ ActivateMotionPlusWithMode(ctx, motion_plus_mode);
+ }
break;
}
}
@@ -578,14 +719,12 @@ UpdateDeviceIdentity(SDL_HIDAPI_Device *device)
case k_eWiiExtensionControllerType_None:
name = "Nintendo Wii Remote";
break;
- case k_eWiiExtensionControllerType_Nunchuck:
- name = "Nintendo Wii Remote with Nunchuck";
+ case k_eWiiExtensionControllerType_Nunchuk:
+ name = "Nintendo Wii Remote with Nunchuk";
break;
- case k_eWiiExtensionControllerType_ClassicController:
+ case k_eWiiExtensionControllerType_Gamepad:
name = "Nintendo Wii Remote with Classic Controller";
break;
- case k_eWiiExtensionControllerType_ClassicControllerPro:
- name = "Nintendo Wii Remote with Classic Controller Pro";
break;
case k_eWiiExtensionControllerType_WiiUPro:
name = "Nintendo Wii U Pro Controller";
@@ -661,9 +800,19 @@ HIDAPI_DriverWii_OpenJoystick(SDL_HIDAPI_Device *device, SDL_Joystick *joystick)
InitializeExtension(ctx);
+ GetMotionPlusState(ctx, &ctx->m_bMotionPlusPresent, &ctx->m_ucMotionPlusMode);
+
+ if (NeedsPeriodicMotionPlusCheck(ctx, SDL_FALSE)) {
+ SchedulePeriodicMotionPlusCheck(ctx);
+ }
+
if (ctx->m_eExtensionControllerType == k_eWiiExtensionControllerType_None ||
- ctx->m_eExtensionControllerType == k_eWiiExtensionControllerType_Nunchuck) {
+ ctx->m_eExtensionControllerType == k_eWiiExtensionControllerType_Nunchuk) {
SDL_PrivateJoystickAddSensor(joystick, SDL_SENSOR_ACCEL, 100.0f);
+
+ if (ctx->m_bMotionPlusPresent) {
+ SDL_PrivateJoystickAddSensor(joystick, SDL_SENSOR_GYRO, 100.0f);
+ }
}
SDL_AddHintCallback(SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS,
@@ -753,8 +902,19 @@ HIDAPI_DriverWii_SetJoystickSensorsEnabled(SDL_HIDAPI_Device *device, SDL_Joysti
{
SDL_DriverWii_Context *ctx = (SDL_DriverWii_Context *)device->context;
- ctx->m_bReportSensors = enabled;
+ if (enabled != ctx->m_bReportSensors) {
+ ctx->m_bReportSensors = enabled;
+ if (ctx->m_bMotionPlusPresent) {
+ if (enabled) {
+ ActivateMotionPlus(ctx);
+ } else {
+ DeactivateMotionPlus(ctx);
+ }
+ }
+
+ ResetButtonPacketType(ctx);
+ }
return 0;
}
@@ -815,7 +975,7 @@ static void PostPackedButtonData(SDL_Joystick *joystick, const Uint8 defs[][8],
}
}
-static const Uint8 WUP_CLASSIC_BUTTON_DEFS[3][8] = {
+static const Uint8 GAMEPAD_BUTTON_DEFS[3][8] = {
{
0xFF /* Unused */, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, SDL_CONTROLLER_BUTTON_START, SDL_CONTROLLER_BUTTON_GUIDE,
SDL_CONTROLLER_BUTTON_BACK, SDL_CONTROLLER_BUTTON_LEFTSHOULDER, SDL_CONTROLLER_BUTTON_DPAD_DOWN, SDL_CONTROLLER_BUTTON_DPAD_RIGHT,
@@ -828,7 +988,7 @@ static const Uint8 WUP_CLASSIC_BUTTON_DEFS[3][8] = {
}
};
-static const Uint8 WUP_CLASSIC_BUTTON_DEFS_POSITIONAL[3][8] = {
+static const Uint8 GAMEPAD_BUTTON_DEFS_POSITIONAL[3][8] = {
{
0xFF /* Unused */, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, SDL_CONTROLLER_BUTTON_START, SDL_CONTROLLER_BUTTON_GUIDE,
SDL_CONTROLLER_BUTTON_BACK, SDL_CONTROLLER_BUTTON_LEFTSHOULDER, SDL_CONTROLLER_BUTTON_DPAD_DOWN, SDL_CONTROLLER_BUTTON_DPAD_RIGHT,
@@ -841,10 +1001,46 @@ static const Uint8 WUP_CLASSIC_BUTTON_DEFS_POSITIONAL[3][8] = {
}
};
+static const Uint8 MP_GAMEPAD_BUTTON_DEFS[3][8] = {
+ {
+ 0xFF /* Unused */, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, SDL_CONTROLLER_BUTTON_START, SDL_CONTROLLER_BUTTON_GUIDE,
+ SDL_CONTROLLER_BUTTON_BACK, SDL_CONTROLLER_BUTTON_LEFTSHOULDER, SDL_CONTROLLER_BUTTON_DPAD_DOWN, SDL_CONTROLLER_BUTTON_DPAD_RIGHT,
+ }, {
+ 0xFF /* Motion Plus data */, 0xFF /* Motion Plus data */, 0xFF /* ZR */, SDL_CONTROLLER_BUTTON_X,
+ SDL_CONTROLLER_BUTTON_A, SDL_CONTROLLER_BUTTON_Y, SDL_CONTROLLER_BUTTON_B, 0xFF /*ZL*/,
+ }, {
+ SDL_CONTROLLER_BUTTON_RIGHTSTICK, SDL_CONTROLLER_BUTTON_LEFTSTICK, 0xFF /* Charging */, 0xFF /* Plugged In */,
+ 0xFF /* Unused */, 0xFF /* Unused */, 0xFF /* Unused */, 0xFF /* Unused */,
+ }
+};
+
+static const Uint8 MP_GAMEPAD_BUTTON_DEFS_POSITIONAL[3][8] = {
+ {
+ 0xFF /* Unused */, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, SDL_CONTROLLER_BUTTON_START, SDL_CONTROLLER_BUTTON_GUIDE,
+ SDL_CONTROLLER_BUTTON_BACK, SDL_CONTROLLER_BUTTON_LEFTSHOULDER, SDL_CONTROLLER_BUTTON_DPAD_DOWN, SDL_CONTROLLER_BUTTON_DPAD_RIGHT,
+ }, {
+ 0xFF /* Motion Plus data */, 0xFF /* Motion Plus data */, 0xFF /* ZR */, SDL_CONTROLLER_BUTTON_Y,
+ SDL_CONTROLLER_BUTTON_B, SDL_CONTROLLER_BUTTON_X, SDL_CONTROLLER_BUTTON_A, 0xFF /*ZL*/,
+ }, {
+ SDL_CONTROLLER_BUTTON_RIGHTSTICK, SDL_CONTROLLER_BUTTON_LEFTSTICK, 0xFF /* Charging */, 0xFF /* Plugged In */,
+ 0xFF /* Unused */, 0xFF /* Unused */, 0xFF /* Unused */, 0xFF /* Unused */,
+ }
+};
+
+static const Uint8 MP_FIXUP_DPAD_BUTTON_DEFS[2][8] = {
+ {
+ SDL_CONTROLLER_BUTTON_DPAD_UP, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF,
+ }, {
+ SDL_CONTROLLER_BUTTON_DPAD_LEFT, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF,
+ }
+};
+
static void HandleWiiUProButtonData(SDL_DriverWii_Context *ctx, SDL_Joystick *joystick, const WiiButtonData *data)
{
static const Uint8 axes[] = { SDL_CONTROLLER_AXIS_LEFTX, SDL_CONTROLLER_AXIS_RIGHTX, SDL_CONTROLLER_AXIS_LEFTY, SDL_CONTROLLER_AXIS_RIGHTY };
- const Uint8 (*buttons)[8] = ctx->m_bUseButtonLabels ? WUP_CLASSIC_BUTTON_DEFS : WUP_CLASSIC_BUTTON_DEFS_POSITIONAL;
+ const Uint8 (*buttons)[8] = ctx->m_bUseButtonLabels ? GAMEPAD_BUTTON_DEFS : GAMEPAD_BUTTON_DEFS_POSITIONAL;
Uint8 zl, zr;
int i;
@@ -871,9 +1067,11 @@ static void HandleWiiUProButtonData(SDL_DriverWii_Context *ctx, SDL_Joystick *jo
UpdatePowerLevelWiiU(joystick, data->rgucExtension[10]);
}
-static void HandleClassicControllerButtonData(SDL_DriverWii_Context *ctx, SDL_Joystick *joystick, const WiiButtonData *data)
+static void HandleGamepadControllerButtonData(SDL_DriverWii_Context *ctx, SDL_Joystick *joystick, const WiiButtonData *data)
{
- const Uint8 (*buttons)[8] = ctx->m_bUseButtonLabels ? WUP_CLASSIC_BUTTON_DEFS : WUP_CLASSIC_BUTTON_DEFS_POSITIONAL;
+ const Uint8 (*buttons)[8] = ctx->m_bUseButtonLabels ?
+ ((ctx->m_ucMotionPlusMode == WII_MOTIONPLUS_MODE_GAMEPAD) ? MP_GAMEPAD_BUTTON_DEFS : GAMEPAD_BUTTON_DEFS) :
+ ((ctx->m_ucMotionPlusMode == WII_MOTIONPLUS_MODE_GAMEPAD) ? MP_GAMEPAD_BUTTON_DEFS_POSITIONAL : GAMEPAD_BUTTON_DEFS_POSITIONAL);
Uint8 lx, ly, rx, ry, zl, zr;
if (data->ucNExtensionBytes < 6) {
@@ -882,6 +1080,9 @@ static void HandleClassicControllerButtonData(SDL_DriverWii_Context *ctx, SDL_Jo
/* Buttons */
PostPackedButtonData(joystick, buttons, data->rgucExtension + 4, 2, SDL_RELEASED, SDL_PRESSED);
+ if (ctx->m_ucMotionPlusMode == WII_MOTIONPLUS_MODE_GAMEPAD) {
+ PostPackedButtonData(joystick, MP_FIXUP_DPAD_BUTTON_DEFS, data->rgucExtension, 2, SDL_RELEASED, SDL_PRESSED);
+ }
/* Triggers */
zl = data->rgucExtension[5] & 0x80;
@@ -890,8 +1091,13 @@ static void HandleClassicControllerButtonData(SDL_DriverWii_Context *ctx, SDL_Jo
SDL_PrivateJoystickAxis(joystick, SDL_CONTROLLER_AXIS_TRIGGERRIGHT, zr ? SDL_JOYSTICK_AXIS_MIN : SDL_JOYSTICK_AXIS_MAX);
/* Sticks */
- lx = data->rgucExtension[0] & 0x3F;
- ly = data->rgucExtension[1] & 0x3F;
+ if (ctx->m_ucMotionPlusMode == WII_MOTIONPLUS_MODE_GAMEPAD) {
+ lx = data->rgucExtension[0] & 0x3E;
+ ly = data->rgucExtension[1] & 0x3E;
+ } else {
+ lx = data->rgucExtension[0] & 0x3F;
+ ly = data->rgucExtension[1] & 0x3F;
+ }
rx = (data->rgucExtension[2] >> 7) | ((data->rgucExtension[1] >> 5) & 0x06) | ((data->rgucExtension[0] >> 3) & 0x18);
ry = data->rgucExtension[2] & 0x1F;
PostStickCalibrated(joystick, &ctx->m_StickCalibrationData[0], SDL_CONTROLLER_AXIS_LEFTX, lx);
@@ -938,35 +1144,95 @@ static void HandleWiiRemoteButtonDataAsMainController(SDL_DriverWii_Context *ctx
static void HandleNunchuckButtonData(SDL_DriverWii_Context *ctx, SDL_Joystick *joystick, const WiiButtonData *data)
{
- SDL_bool c = data->rgucExtension[5] & 2 ? SDL_RELEASED : SDL_PRESSED;
- SDL_bool z = data->rgucExtension[5] & 1 ? SDL_RELEASED : SDL_PRESSED;
+ Uint8 c, z;
+
if (data->ucNExtensionBytes < 6) {
return;
}
+ if (ctx->m_ucMotionPlusMode == WII_MOTIONPLUS_MODE_NUNCHUK) {
+ c = (data->rgucExtension[5] & 0x08) ? SDL_RELEASED : SDL_PRESSED;
+ z = (data->rgucExtension[5] & 0x04) ? SDL_RELEASED : SDL_PRESSED;
+ } else {
+ c = (data->rgucExtension[5] & 0x02) ? SDL_RELEASED : SDL_PRESSED;
+ z = (data->rgucExtension[5] & 0x01) ? SDL_RELEASED : SDL_PRESSED;
+ }
SDL_PrivateJoystickButton(joystick, SDL_CONTROLLER_BUTTON_LEFTSHOULDER, c);
SDL_PrivateJoystickAxis(joystick, SDL_CONTROLLER_AXIS_TRIGGERLEFT, z ? SDL_JOYSTICK_AXIS_MAX : SDL_JOYSTICK_AXIS_MIN);
- if (data->rgucExtension[0] != 0xFF) {
- PostStickCalibrated(joystick, &ctx->m_StickCalibrationData[0], SDL_CONTROLLER_AXIS_LEFTX, data->rgucExtension[0]);
- }
- if (data->rgucExtension[1] != 0xFF) {
- PostStickCalibrated(joystick, &ctx->m_StickCalibrationData[1], SDL_CONTROLLER_AXIS_LEFTY, data->rgucExtension[1]);
- }
+ PostStickCalibrated(joystick, &ctx->m_StickCalibrationData[0], SDL_CONTROLLER_AXIS_LEFTX, data->rgucExtension[0]);
+ PostStickCalibrated(joystick, &ctx->m_StickCalibrationData[1], SDL_CONTROLLER_AXIS_LEFTY, data->rgucExtension[1]);
+#if 0 /* We'll report this when we have the concept of right/left sensors */
if (ctx->m_bReportSensors) {
const float ACCEL_RES_PER_G = 200.0f;
Sint16 x, y, z;
float values[3];
- x = (((Sint16)data->rgucExtension[2] << 2) | ((data->rgucBaseButtons[5] >> 2) & 0x03)) - 0x200;
- y = (((Sint16)data->rgucExtension[3] << 2) | ((data->rgucBaseButtons[5] >> 4) & 0x03)) - 0x200;
- z = (((Sint16)data->rgucExtension[4] << 2) | ((data->rgucBaseButtons[5] >> 6) & 0x03)) - 0x200;
+ x = (data->rgucExtension[2] << 2);
+ y = (data->rgucExtension[3] << 2);
+ z = (data->rgucExtension[4] << 2);
+
+ if (ctx->m_ucMotionPlusMode == WII_MOTIONPLUS_MODE_NUNCHUK) {
+ x |= ((data->rgucExtension[5] >> 3) & 0x02);
+ y |= ((data->rgucExtension[5] >> 4) & 0x02);
+ z &= ~0x04;
+ z |= ((data->rgucExtension[5] >> 5) & 0x06);
+ } else {
+ x |= ((data->rgucExtension[5] >> 2) & 0x03);
+ y |= ((data->rgucExtension[5] >> 4) & 0x03);
+ z |= ((data->rgucExtension[5] >> 6) & 0x03);
+ }
+
+ x -= 0x200;
+ y -= 0x200;
+ z -= 0x200;
values[0] = -((float)x / ACCEL_RES_PER_G) * SDL_STANDARD_GRAVITY;
values[1] = ((float)z / ACCEL_RES_PER_G) * SDL_STANDARD_GRAVITY;
values[2] = ((float)y / ACCEL_RES_PER_G) * SDL_STANDARD_GRAVITY;
SDL_PrivateJoystickSensor(joystick, SDL_SENSOR_ACCEL, values, 3);
}
+#endif
+}
+
+static void HandleMotionPlusData(SDL_DriverWii_Context *ctx, SDL_Joystick *joystick, const WiiButtonData *data)
+{
+ if (ctx->m_bReportSensors) {
+ const float GYRO_RES_PER_DEGREE = 8192.0f;
+ int x, y, z;
+ float values[3];
+
+ x = (data->rgucExtension[0] | ((data->rgucExtension[3] << 6) & 0xFF00)) - 8192;
+ y = (data->rgucExtension[1] | ((data->rgucExtension[4] << 6) & 0xFF00)) - 8192;
+ z = (data->rgucExtension[2] | ((data->rgucExtension[5] << 6) & 0xFF00)) - 8192;
+
+ if (data->rgucExtension[3] & 0x02) {
+ /* Slow rotation rate: 8192/440 units per deg/s */
+ x *= 440;
+ } else {
+ /* Fast rotation rate: 8192/2000 units per deg/s */
+ x *= 2000;
+ }
+ if (data->rgucExtension[4] & 0x02) {
+ /* Slow rotation rate: 8192/440 units per deg/s */
+ y *= 440;
+ } else {
+ /* Fast rotation rate: 8192/2000 units per deg/s */
+ y *= 2000;
+ }
+ if (data->rgucExtension[3] & 0x01) {
+ /* Slow rotation rate: 8192/440 units per deg/s */
+ z *= 440;
+ } else {
+ /* Fast rotation rate: 8192/2000 units per deg/s */
+ z *= 2000;
+ }
+
+ values[0] = -((float)z / GYRO_RES_PER_DEGREE) * (float)M_PI / 180.0f;
+ values[1] = ((float)x / GYRO_RES_PER_DEGREE) * (float)M_PI / 180.0f;
+ values[2] = ((float)y / GYRO_RES_PER_DEGREE) * (float)M_PI / 180.0f;
+ SDL_Private
(Patch may be truncated, please check the link at the top of this post.)