Commit c3dea23120d88166993620bda5847c5b026e6c9d
2020-11-09T22:39:33
Added support for reading the paddles on a Xbox Elite Series 2 controller in Bluetooth mode
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101
diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
index e483037..c161aa3 100644
--- a/src/joystick/SDL_joystick.c
+++ b/src/joystick/SDL_joystick.c
@@ -1785,7 +1785,8 @@ SDL_IsJoystickXboxOneElite(Uint16 vendor_id, Uint16 product_id)
{
if (vendor_id == USB_VENDOR_MICROSOFT) {
if (product_id == USB_PRODUCT_XBOX_ONE_ELITE_SERIES_1 ||
- product_id == USB_PRODUCT_XBOX_ONE_ELITE_SERIES_2) {
+ product_id == USB_PRODUCT_XBOX_ONE_ELITE_SERIES_2 ||
+ product_id == USB_PRODUCT_XBOX_ONE_ELITE_SERIES_2_BLUETOOTH) {
return SDL_TRUE;
}
}
diff --git a/src/joystick/hidapi/SDL_hidapi_xboxone.c b/src/joystick/hidapi/SDL_hidapi_xboxone.c
index 5a82a10..109317f 100644
--- a/src/joystick/hidapi/SDL_hidapi_xboxone.c
+++ b/src/joystick/hidapi/SDL_hidapi_xboxone.c
@@ -651,6 +651,60 @@ HIDAPI_DriverXboxOneBluetooth_HandleStatePacketV2(SDL_Joystick *joystick, hid_de
SDL_PrivateJoystickButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_LEFT, dpad_left);
}
+ /*
+ Paddle bits:
+ P3: 0x04 (A) P1: 0x01 (B)
+ P4: 0x08 (X) P2: 0x02 (Y)
+ */
+ if (ctx->has_paddles && (size == 39 || size == 55)) {
+ int paddle_index;
+ int button1_bit;
+ int button2_bit;
+ int button3_bit;
+ int button4_bit;
+ SDL_bool paddles_mapped;
+
+ if (size == 55) {
+ /* Initial firmware for the Xbox Elite Series 2 controller */
+ paddle_index = 33;
+ button1_bit = 0x01;
+ button2_bit = 0x02;
+ button3_bit = 0x04;
+ button4_bit = 0x08;
+ paddles_mapped = (data[35] != 0);
+ } else if (size == 39) {
+ /* Updated firmware for the Xbox Elite Series 2 controller */
+ paddle_index = 17;
+ button1_bit = 0x01;
+ button2_bit = 0x02;
+ button3_bit = 0x04;
+ button4_bit = 0x08;
+ paddles_mapped = (data[19] != 0);
+ }
+
+#ifdef DEBUG_XBOX_PROTOCOL
+ SDL_Log(">>> Paddles: %d,%d,%d,%d mapped = %s\n",
+ (data[paddle_index] & button1_bit) ? 1 : 0,
+ (data[paddle_index] & button2_bit) ? 1 : 0,
+ (data[paddle_index] & button3_bit) ? 1 : 0,
+ (data[paddle_index] & button4_bit) ? 1 : 0,
+ paddles_mapped ? "TRUE" : "FALSE"
+ );
+#endif
+
+ if (paddles_mapped) {
+ /* Respect that the paddles are being used for other controls and don't pass them on to the app */
+ data[paddle_index] = 0;
+ }
+
+ if (ctx->last_state[paddle_index] != data[paddle_index]) {
+ SDL_PrivateJoystickButton(joystick, SDL_CONTROLLER_BUTTON_MISC1 + 0, (data[paddle_index] & button1_bit) ? SDL_PRESSED : SDL_RELEASED);
+ SDL_PrivateJoystickButton(joystick, SDL_CONTROLLER_BUTTON_MISC1 + 1, (data[paddle_index] & button2_bit) ? SDL_PRESSED : SDL_RELEASED);
+ SDL_PrivateJoystickButton(joystick, SDL_CONTROLLER_BUTTON_MISC1 + 2, (data[paddle_index] & button3_bit) ? SDL_PRESSED : SDL_RELEASED);
+ SDL_PrivateJoystickButton(joystick, SDL_CONTROLLER_BUTTON_MISC1 + 3, (data[paddle_index] & button4_bit) ? SDL_PRESSED : SDL_RELEASED);
+ }
+ }
+
axis = (int)*(Uint16*)(&data[1]) - 0x8000;
SDL_PrivateJoystickAxis(joystick, SDL_CONTROLLER_AXIS_LEFTX, axis);
axis = (int)*(Uint16*)(&data[3]) - 0x8000;
@@ -717,15 +771,14 @@ HIDAPI_DriverXboxOne_UpdateDevice(SDL_HIDAPI_Device *device)
if (ctx->bluetooth) {
switch (data[0]) {
case 0x01:
- switch (size) {
- case 16:
+ if (size == 16) {
HIDAPI_DriverXboxOneBluetooth_HandleStatePacketV1(joystick, device->dev, ctx, data, size);
- break;
- case 17:
+ } else if (size > 16) {
HIDAPI_DriverXboxOneBluetooth_HandleStatePacketV2(joystick, device->dev, ctx, data, size);
- break;
- default:
- break;
+ } else {
+#ifdef DEBUG_JOYSTICK
+ SDL_Log("Unknown Xbox One Bluetooth packet size: %d\n", size);
+#endif
}
break;
case 0x02: