projects
/
pub
/
USBasp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
99ff27e
)
Fix Class Driver GenericHID demo using the wrong size for the returned reports.
author
Dean Camera
<dean@fourwalledcubicle.com>
Wed, 21 Sep 2011 06:09:07 +0000
(06:09 +0000)
committer
Dean Camera
<dean@fourwalledcubicle.com>
Wed, 21 Sep 2011 06:09:07 +0000
(06:09 +0000)
Demos/Device/ClassDriver/GenericHID/Descriptors.c
patch
|
blob
|
blame
|
history
Demos/Device/ClassDriver/GenericHID/GenericHID.c
patch
|
blob
|
blame
|
history
Demos/Device/LowLevel/GenericHID/Descriptors.c
patch
|
blob
|
blame
|
history
diff --git
a/Demos/Device/ClassDriver/GenericHID/Descriptors.c
b/Demos/Device/ClassDriver/GenericHID/Descriptors.c
index
a18c0aa
..
3b2af81
100644
(file)
--- a/
Demos/Device/ClassDriver/GenericHID/Descriptors.c
+++ b/
Demos/Device/ClassDriver/GenericHID/Descriptors.c
@@
-46,7
+46,7
@@
const USB_Descriptor_HIDReport_Datatype_t PROGMEM GenericReport[] =
{
/* Use the HID class driver's standard Vendor HID report.
const USB_Descriptor_HIDReport_Datatype_t PROGMEM GenericReport[] =
{
/* Use the HID class driver's standard Vendor HID report.
- * Vendor Usage Page:
1
+ * Vendor Usage Page:
0
* Vendor Collection Usage: 1
* Vendor Report IN Usage: 2
* Vendor Report OUT Usage: 3
* Vendor Collection Usage: 1
* Vendor Report IN Usage: 2
* Vendor Report OUT Usage: 3
diff --git
a/Demos/Device/ClassDriver/GenericHID/GenericHID.c
b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
index
f44d7fc
..
466efaf
100644
(file)
--- a/
Demos/Device/ClassDriver/GenericHID/GenericHID.c
+++ b/
Demos/Device/ClassDriver/GenericHID/GenericHID.c
@@
-151,7
+151,7
@@
bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
Data[2] = ((CurrLEDMask & LEDS_LED3) ? 1 : 0);
Data[3] = ((CurrLEDMask & LEDS_LED4) ? 1 : 0);
Data[2] = ((CurrLEDMask & LEDS_LED3) ? 1 : 0);
Data[3] = ((CurrLEDMask & LEDS_LED4) ? 1 : 0);
- *ReportSize =
sizeof(GENERIC_REPORT_SIZE)
;
+ *ReportSize =
GENERIC_REPORT_SIZE
;
return false;
}
return false;
}
diff --git
a/Demos/Device/LowLevel/GenericHID/Descriptors.c
b/Demos/Device/LowLevel/GenericHID/Descriptors.c
index
a981b93
..
79697ec
100644
(file)
--- a/
Demos/Device/LowLevel/GenericHID/Descriptors.c
+++ b/
Demos/Device/LowLevel/GenericHID/Descriptors.c
@@
-45,7
+45,7
@@
*/
const USB_Descriptor_HIDReport_Datatype_t PROGMEM GenericReport[] =
{
*/
const USB_Descriptor_HIDReport_Datatype_t PROGMEM GenericReport[] =
{
- HID_RI_USAGE_PAGE(16, 0xFF00), /* Vendor Page
1
*/
+ HID_RI_USAGE_PAGE(16, 0xFF00), /* Vendor Page
0
*/
HID_RI_USAGE(8, 0x01), /* Vendor Usage 1 */
HID_RI_COLLECTION(8, 0x01), /* Vendor Usage 1 */
HID_RI_USAGE(8, 0x02), /* Vendor Usage 2 */
HID_RI_USAGE(8, 0x01), /* Vendor Usage 1 */
HID_RI_COLLECTION(8, 0x01), /* Vendor Usage 1 */
HID_RI_USAGE(8, 0x02), /* Vendor Usage 2 */