diff options
| author | Martino Facchin <m.facchin@arduino.cc> | 2015-07-01 10:08:03 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@arduino.cc> | 2015-07-16 13:13:51 +0200 |
| commit | 3d0331b8f6980633789f543947d36a9156455670 (patch) | |
| tree | 49d21bfda9dbf10edd805b89fd6efc4c57362a76 | |
| parent | 30ebf7f92483bb57076ba571dcd04b4e8bb94872 (diff) | |
fix HID headers
| -rw-r--r-- | cores/arduino/USBCore.h | 12 | ||||
| -rw-r--r-- | libraries/HID/HID.h | 11 |
2 files changed, 11 insertions, 12 deletions
diff --git a/cores/arduino/USBCore.h b/cores/arduino/USBCore.h index c19d68a..66f8c05 100644 --- a/cores/arduino/USBCore.h +++ b/cores/arduino/USBCore.h @@ -61,13 +61,6 @@ #define MSC_RESET 0xFF #define MSC_GET_MAX_LUN 0xFE -#define HID_GET_REPORT 0x01 -#define HID_GET_IDLE 0x02 -#define HID_GET_PROTOCOL 0x03 -#define HID_SET_REPORT 0x09 -#define HID_SET_IDLE 0x0A -#define HID_SET_PROTOCOL 0x0B - // Descriptors #define USB_DEVICE_DESC_SIZE 18 @@ -131,11 +124,6 @@ #define MSC_SUBCLASS_SCSI 0x06 #define MSC_PROTOCOL_BULK_ONLY 0x50 -#define HID_HID_DESCRIPTOR_TYPE 0x21 -#define HID_REPORT_DESCRIPTOR_TYPE 0x22 -#define HID_PHYSICAL_DESCRIPTOR_TYPE 0x23 - - // Device typedef struct { u8 len; // 18 diff --git a/libraries/HID/HID.h b/libraries/HID/HID.h index fe8ee09..5bd137c 100644 --- a/libraries/HID/HID.h +++ b/libraries/HID/HID.h @@ -31,6 +31,17 @@ //================================================================================ // HID 'Driver' +#define HID_GET_REPORT 0x01 +#define HID_GET_IDLE 0x02 +#define HID_GET_PROTOCOL 0x03 +#define HID_SET_REPORT 0x09 +#define HID_SET_IDLE 0x0A +#define HID_SET_PROTOCOL 0x0B + +#define HID_HID_DESCRIPTOR_TYPE 0x21 +#define HID_REPORT_DESCRIPTOR_TYPE 0x22 +#define HID_PHYSICAL_DESCRIPTOR_TYPE 0x23 + class HID_ { public: |