diff options
| author | hathach <[email protected]> | 2017-08-03 21:45:16 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2017-08-03 21:45:16 +0700 |
| commit | 820afdc7bf24af171b8585f84adf5361c13bc1d3 (patch) | |
| tree | bea01841cb9e2142b4f1cffdaacc485eba415122 | |
| parent | 6ecea8666969e4cee5434f5b6bcbc5289c9f7e58 (diff) | |
clean up
| -rw-r--r-- | tinyusb/class/cdc.h | 2 | ||||
| -rw-r--r-- | tinyusb/class/hid.h | 61 | ||||
| -rw-r--r-- | tinyusb/device/usbd.c | 3 |
3 files changed, 65 insertions, 1 deletions
diff --git a/tinyusb/class/cdc.h b/tinyusb/class/cdc.h index 0fd25cc55..5cabf1ec4 100644 --- a/tinyusb/class/cdc.h +++ b/tinyusb/class/cdc.h @@ -387,7 +387,7 @@ typedef struct ATTR_PACKED {
uint32_t bit_rate;
uint8_t stop_bits; ///< 0: 1 stop bit - 1: 1.5 stop bits - 2: 2 stop bits
- uint8_t parity; ///< 0: None - 1: Odd - 2: Even - 3: Mark - 4: Space
+ uint8_t parity; ///< 0: None - 1: Odd - 2: Even - 3: Mark - 4: Space
uint8_t data_bits; ///< can be 5, 6, 7, 8 or 16
} cdc_line_coding_t;
diff --git a/tinyusb/class/hid.h b/tinyusb/class/hid.h index 23ab3f66e..54b78734b 100644 --- a/tinyusb/class/hid.h +++ b/tinyusb/class/hid.h @@ -525,6 +525,67 @@ enum { HID_USAGE_DESKTOP_SYSTEM_DISPLAY_LCD_AUTOSCALE = 0xB7
};
+
+/// HID Usage Table: Consumer Page (0x0C)
+/// Only contains controls that supported by Windows (whole list is too long)
+enum
+{
+ // Generic Control
+ HID_USAGE_CONSUMER_CONTROL = 0x0001,
+
+ // Power Control
+ HID_USAGE_CONSUMER_POWER = 0x0030,
+ HID_USAGE_CONSUMER_RESET = 0x0031,
+ HID_USAGE_CONSUMER_SLEEP = 0x0032,
+
+ // Screen Brightness
+ HID_USAGE_CONSUMER_BRIGHTNESS_INCREMENT = 0x006F,
+ HID_USAGE_CONSUMER_BRIGHTNESS_DECREMENT = 0x0070,
+
+ // These HID usages operate only on mobile systems (battery powered) and
+ // require Windows 8 (build 8302 or greater).
+ HID_USAGE_CONSUMER_WIRELESS_RADIO_CONTROLS = 0x000C,
+ HID_USAGE_CONSUMER_WIRELESS_RADIO_BUTTONS = 0x00C6,
+ HID_USAGE_CONSUMER_WIRELESS_RADIO_LED = 0x00C7,
+ HID_USAGE_CONSUMER_WIRELESS_RADIO_SLIDER_SWITCH = 0x00C8,
+
+ // Media Control
+ HID_USAGE_CONSUMER_PLAY_PAUSE = 0x00CD,
+ HID_USAGE_CONSUMER_SCAN_NEXT = 0x00B5,
+ HID_USAGE_CONSUMER_SCAN_PREVIOUS = 0x00B6,
+ HID_USAGE_CONSUMER_STOP = 0x00B7,
+ HID_USAGE_CONSUMER_VOLUME = 0x00E0,
+ HID_USAGE_CONSUMER_MUTE = 0x00E2,
+ HID_USAGE_CONSUMER_BASS = 0x00E3,
+ HID_USAGE_CONSUMER_TREBLE = 0x00E4,
+ HID_USAGE_CONSUMER_BASS_BOOST = 0x00E5,
+ HID_USAGE_CONSUMER_VOLUME_INCREMENT = 0x00E9,
+ HID_USAGE_CONSUMER_VOLUME_DECREMENT = 0x00EA,
+ HID_USAGE_CONSUMER_BASS_INCREMENT = 0x0152,
+ HID_USAGE_CONSUMER_BASS_DECREMENT = 0x0153,
+ HID_USAGE_CONSUMER_TREBLE_INCREMENT = 0x0154,
+ HID_USAGE_CONSUMER_TREBLE_DECREMENT = 0x0155,
+
+ // Application Launcher
+ HID_USAGE_CONSUMER_AL_CONSUMER_CONTROL_CONFIGURATION = 0x0183,
+ HID_USAGE_CONSUMER_AL_EMAIL_READER = 0x018A,
+ HID_USAGE_CONSUMER_AL_CALCULATOR = 0x0192,
+ HID_USAGE_CONSUMER_AL_LOCAL_BROWSER = 0x0194,
+
+ // Browser/Explorer Specific
+ HID_USAGE_CONSUMER_AC_SEARCH = 0x0221,
+ HID_USAGE_CONSUMER_AC_HOME = 0x0223,
+ HID_USAGE_CONSUMER_AC_BACK = 0x0224,
+ HID_USAGE_CONSUMER_AC_FORWARD = 0x0225,
+ HID_USAGE_CONSUMER_AC_STOP = 0x0226,
+ HID_USAGE_CONSUMER_AC_REFRESH = 0x0227,
+ HID_USAGE_CONSUMER_AC_BOOKMARKS = 0x022A,
+
+ // Mouse Horizontal scroll
+ HID_USAGE_CONSUMER_AC_PAN = 0x0238,
+};
+
+
#ifdef __cplusplus
}
#endif
diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c index bba32a6bd..4c304a2f8 100644 --- a/tinyusb/device/usbd.c +++ b/tinyusb/device/usbd.c @@ -375,6 +375,9 @@ static tusb_error_t get_descriptor(uint8_t coreid, tusb_control_request_t const (*p_length) = p_data[0]; // first byte of descriptor is its size
break;
+ // TODO Report Descriptor (HID Generic)
+ // TODO HID Descriptor
+
default: return TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT;
}
|