Skip to content

Commit dd1c909

Browse files
earlephilhowerearlephilhower
authored
Factor out cut-n-pasted GAMEPAD16 HID structures (#2302)
Create a single spot with the gamepad16's HID report descriptor and report structure. Avoids cut-n-pasted code.
1 parent 8140c35 commit dd1c909

File tree

3 files changed

+77
-43
lines changed

3 files changed

+77
-43
lines changed

‎cores/rp2040/sdkoverride/tusb_gamepad16.h

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
/*
2+
16-bit axis gamepad definition
3+
Copyright (c) 2024 Earle F. Philhower, III <earlephilhower@yahoo.com>
4+
5+
This library is free software; you can redistribute it and/or
6+
modify it under the terms of the GNU Lesser General Public
7+
License as published by the Free Software Foundation; either
8+
version 2.1 of the License, or (at your option) any later version.
9+
10+
This library is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public
16+
License along with this library; if not, write to the Free Software
17+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18+
*/
19+
20+
#pragma once
21+
22+
#include "tusb.h"
23+
#include "class/hid/hid_device.h"
24+
25+
#define TUD_HID_REPORT_DESC_GAMEPAD16(...) \
26+
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ) ,\
27+
HID_USAGE ( HID_USAGE_DESKTOP_GAMEPAD ) ,\
28+
HID_COLLECTION ( HID_COLLECTION_APPLICATION ) ,\
29+
/* Report ID if any */\
30+
__VA_ARGS__ \
31+
/* 16 bit X, Y, Z, Rz, Rx, Ry (min -32767, max 32767 ) */ \
32+
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ) ,\
33+
HID_USAGE ( HID_USAGE_DESKTOP_X ) ,\
34+
HID_USAGE ( HID_USAGE_DESKTOP_Y ) ,\
35+
HID_USAGE ( HID_USAGE_DESKTOP_Z ) ,\
36+
HID_USAGE ( HID_USAGE_DESKTOP_RZ ) ,\
37+
HID_USAGE ( HID_USAGE_DESKTOP_RX ) ,\
38+
HID_USAGE ( HID_USAGE_DESKTOP_RY ) ,\
39+
HID_LOGICAL_MIN_N ( -32767, 2 ) ,\
40+
HID_LOGICAL_MAX_N ( 32767, 2 ) ,\
41+
HID_REPORT_COUNT ( 6 ) ,\
42+
HID_REPORT_SIZE ( 16 ) ,\
43+
HID_INPUT ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ) ,\
44+
/* 8 bit DPad/Hat Button Map */ \
45+
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ) ,\
46+
HID_USAGE ( HID_USAGE_DESKTOP_HAT_SWITCH ) ,\
47+
HID_LOGICAL_MIN ( 1 ) ,\
48+
HID_LOGICAL_MAX ( 8 ) ,\
49+
HID_PHYSICAL_MIN ( 0 ) ,\
50+
HID_PHYSICAL_MAX_N ( 315, 2 ) ,\
51+
HID_REPORT_COUNT ( 1 ) ,\
52+
HID_REPORT_SIZE ( 8 ) ,\
53+
HID_INPUT ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ) ,\
54+
/* 32 bit Button Map */ \
55+
HID_USAGE_PAGE ( HID_USAGE_PAGE_BUTTON ) ,\
56+
HID_USAGE_MIN ( 1 ) ,\
57+
HID_USAGE_MAX ( 32 ) ,\
58+
HID_LOGICAL_MIN ( 0 ) ,\
59+
HID_LOGICAL_MAX ( 1 ) ,\
60+
HID_REPORT_COUNT ( 32 ) ,\
61+
HID_REPORT_SIZE ( 1 ) ,\
62+
HID_INPUT ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ) ,\
63+
HID_COLLECTION_END \
64+
65+
// HID Gamepad Protocol Report.
66+
typedef struct TU_ATTR_PACKED {
67+
int16_t x; ///< Delta x movement of left analog-stick
68+
int16_t y; ///< Delta y movement of left analog-stick
69+
int16_t z; ///< Delta z movement of right analog-joystick
70+
int16_t rz; ///< Delta Rz movement of right analog-joystick
71+
int16_t rx; ///< Delta Rx movement of analog left trigger
72+
int16_t ry; ///< Delta Ry movement of analog right trigger
73+
uint8_t hat; ///< Buttons mask for currently pressed buttons in the DPad/hat
74+
uint32_t buttons; ///< Buttons mask for currently pressed buttons
75+
} hid_gamepad16_report_t;

‎libraries/HID_Bluetooth/src/HID_Bluetooth.cpp

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,5 @@
11
#include "HID_Bluetooth.h"
2-
3-
#define TUD_HID_REPORT_DESC_GAMEPAD16(...) \
4-
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ) ,\
5-
HID_USAGE ( HID_USAGE_DESKTOP_GAMEPAD ) ,\
6-
HID_COLLECTION ( HID_COLLECTION_APPLICATION ) ,\
7-
/* Report ID if any */\
8-
__VA_ARGS__ \
9-
/* 16 bit X, Y, Z, Rz, Rx, Ry (min -32767, max 32767 ) */ \
10-
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ) ,\
11-
HID_USAGE ( HID_USAGE_DESKTOP_X ) ,\
12-
HID_USAGE ( HID_USAGE_DESKTOP_Y ) ,\
13-
HID_USAGE ( HID_USAGE_DESKTOP_Z ) ,\
14-
HID_USAGE ( HID_USAGE_DESKTOP_RZ ) ,\
15-
HID_USAGE ( HID_USAGE_DESKTOP_RX ) ,\
16-
HID_USAGE ( HID_USAGE_DESKTOP_RY ) ,\
17-
HID_LOGICAL_MIN_N ( -32767, 2 ) ,\
18-
HID_LOGICAL_MAX_N ( 32767, 2 ) ,\
19-
HID_REPORT_COUNT ( 6 ) ,\
20-
HID_REPORT_SIZE ( 16 ) ,\
21-
HID_INPUT ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ) ,\
22-
/* 8 bit DPad/Hat Button Map */ \
23-
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ) ,\
24-
HID_USAGE ( HID_USAGE_DESKTOP_HAT_SWITCH ) ,\
25-
HID_LOGICAL_MIN ( 1 ) ,\
26-
HID_LOGICAL_MAX ( 8 ) ,\
27-
HID_PHYSICAL_MIN ( 0 ) ,\
28-
HID_PHYSICAL_MAX_N ( 315, 2 ) ,\
29-
HID_REPORT_COUNT ( 1 ) ,\
30-
HID_REPORT_SIZE ( 8 ) ,\
31-
HID_INPUT ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ) ,\
32-
/* 32 bit Button Map */ \
33-
HID_USAGE_PAGE ( HID_USAGE_PAGE_BUTTON ) ,\
34-
HID_USAGE_MIN ( 1 ) ,\
35-
HID_USAGE_MAX ( 32 ) ,\
36-
HID_LOGICAL_MIN ( 0 ) ,\
37-
HID_LOGICAL_MAX ( 1 ) ,\
38-
HID_REPORT_COUNT ( 32 ) ,\
39-
HID_REPORT_SIZE ( 1 ) ,\
40-
HID_INPUT ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ) ,\
41-
HID_COLLECTION_END \
42-
43-
2+
#include <sdkoverride/tusb_gamepad16.h>
443

454
//setup the report map.
465
//more generic function to be used with BLE & BT Classis

‎libraries/HID_Joystick

0 commit comments

Comments
 (0)