Skip to content

Avoid collision with tinyusb hid.h enums #7463

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
merged 3 commits into from
Dec 9, 2022
Merged

Avoid collision with tinyusb hid.h enums #7463

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64d4556
Avoid collision with tinyusb hid.h enums
PeterHindes Nov 11, 2022
d7667bd
Merge branch 'master' into patch-2
P-R-O-C-H-Y Dec 2, 2022
2728631
Merge branch 'master' into patch-2
SuGlider Dec 9, 2022
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
6 changes: 3 additions & 3 deletions libraries/BLE/src/HIDTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
#define HID_VERSION_1_11 (0x0111)

/* HID Class */
#define HID_CLASS (3)
#define HID_SUBCLASS_NONE (0)
#define HID_PROTOCOL_NONE (0)
#define BLE_HID_CLASS (3)
#define BLE_HID_SUBCLASS_NONE (0)
#define BLE_HID_PROTOCOL_NONE (0)

/* Descriptors */
#define HID_DESCRIPTOR (33)
Expand Down