rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Code Issues Releases Activity

fix HID headers

Browse Source
This commit is contained in:
Martino Facchin 2015-07-01 10:08:03 +02:00 committed by Cristian Maglie
parent 9074b1ed18
commit dee43a19d7
6 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hardware/arduino/avr/cores/arduino/USBCore.h
View File

@ -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

11
hardware/arduino/avr/libraries/HID/HID.h
View File

@ -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:

1
libraries/CompleteHID/CompleteHID.cpp
View File

@ -1,7 +1,6 @@
#if 1 //defined(USBCON)
#include "CompleteHID.h"
#include "HIDTables.h"
#include "HID.h"
#define HID_MOUSE_ABS_ENABLED

3
libraries/CompleteHID/CompleteHID.h
View File

@ -1,4 +1,5 @@
#ifndef MOUSEANDKEYBOARD_h
#ifndef COMPLETEHID_h
#define COMPLETEHID_h
#if defined(_USING_HID)

8
libraries/CompleteHID/HIDTables.h
View File

@ -1,5 +1,5 @@
#ifndef __HIDTables__
#define HID___HIDTables__
#define __HIDTables__
// These mappings were extracted and transcribed from
@ -453,9 +453,9 @@
#define HID_CONSUMER_CHANNEL_TOP 0x169 // HID type CL
#define HID_CONSUMER_CHANNEL_UNKNOWN 0x16A // HID type CL
// Reserved 0x16B-16F
#define HID_CONSUMER_SUB-CHANNEL 0x170 // HID type LC
#define HID_CONSUMER_SUB-CHANNEL_INCREMENT 0x171 // HID type OSC
#define HID_CONSUMER_SUB-CHANNEL_DECREMENT 0x172 // HID type OSC
#define HID_CONSUMER_SUB_CHANNEL 0x170 // HID type LC
#define HID_CONSUMER_SUB_CHANNEL_INCREMENT 0x171 // HID type OSC
#define HID_CONSUMER_SUB_CHANNEL_DECREMENT 0x172 // HID type OSC
#define HID_CONSUMER_ALTERNATE_AUDIO_INCREMENT 0x173 // HID type OSC
#define HID_CONSUMER_ALTERNATE_AUDIO_DECREMENT 0x174 // HID type OSC
// Reserved 0x175-17F

3
libraries/Keyboard/Keyboard.h
View File

@ -19,6 +19,9 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef KEYBOARD_h
#define KEYBOARD_h
#if defined(_USING_HID)
#error "Can only attach one submodule to HID module"