/*\r
LUFA Library\r
- Copyright (C) Dean Camera, 2009.\r
+ Copyright (C) Dean Camera, 2010.\r
\r
dean [at] fourwalledcubicle [dot] com\r
www.fourwalledcubicle.com\r
*/\r
\r
/*\r
- Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
- Permission to use, copy, modify, and distribute this software\r
- and its documentation for any purpose and without fee is hereby\r
- granted, provided that the above copyright notice appear in all\r
- copies and that both that the copyright notice and this\r
- permission notice and warranty disclaimer appear in supporting\r
- documentation, and that the name of the author not be used in\r
- advertising or publicity pertaining to distribution of the\r
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+ Permission to use, copy, modify, distribute, and sell this \r
+ software and its documentation for any purpose is hereby granted\r
+ without fee, provided that the above copyright notice appear in \r
+ all copies and that both that the copyright notice and this\r
+ permission notice and warranty disclaimer appear in supporting \r
+ documentation, and that the name of the author not be used in \r
+ advertising or publicity pertaining to distribution of the \r
software without specific, written prior permission.\r
\r
The author disclaim all warranties with regard to this\r
.Config =\r
{\r
.DataINPipeNumber = 1,\r
+ .DataINPipeDoubleBank = false,\r
+\r
.DataOUTPipeNumber = 2,\r
+ .DataOUTPipeDoubleBank = false,\r
\r
.HIDInterfaceProtocol = HID_NON_BOOT_PROTOCOL,\r
\r
\r
\r
/** Main program entry point. This routine configures the hardware required by the application, then\r
- * starts the scheduler to run the application tasks.\r
+ * enters a loop to run the application tasks in sequence.\r
*/\r
int main(void)\r
{\r
uint16_t ConfigDescriptorSize;\r
uint8_t ConfigDescriptorData[512];\r
\r
- if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
- sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
+ if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
+ sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
{\r
printf("Error Retrieving Configuration Descriptor.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
LEDMask = LEDS_ALL_LEDS;\r
}\r
else if ((ReportItem->Attributes.Usage.Page == USAGE_PAGE_GENERIC_DCTRL) &&\r
+ (ReportItem->Attributes.Usage.Usage == USAGE_SCROLL_WHEEL) &&\r
+ (ReportItem->ItemType == REPORT_ITEM_TYPE_In))\r
+ {\r
+ /* Get the mouse wheel value if it is contained within the current \r
+ * report, if not, skip to the next item in the parser list\r
+ */\r
+ if (!(USB_GetHIDReportItemInfo(MouseReport, ReportItem)))\r
+ continue; \r
+\r
+ int16_t WheelDelta = (int16_t)(ReportItem->Value << (16 - ReportItem->Attributes.BitSize));\r
+ \r
+ if (WheelDelta)\r
+ LEDMask = (LEDS_LED1 | LEDS_LED2 | ((WheelDelta > 0) ? LEDS_LED3 : LEDS_LED4));\r
+ }\r
+ else if ((ReportItem->Attributes.Usage.Page == USAGE_PAGE_GENERIC_DCTRL) &&\r
((ReportItem->Attributes.Usage.Usage == USAGE_X) ||\r
(ReportItem->Attributes.Usage.Usage == USAGE_Y)) &&\r
(ReportItem->ItemType == REPORT_ITEM_TYPE_In))\r
* we aren't interested in (preventing us from being able to extract them later on, but saving on the RAM they would\r
* have occupied).\r
*\r
- * \param[in] CurrentItemAttributes Pointer to the attrbutes of the item the HID report parser is currently working with\r
+ * \param[in] CurrentItem Pointer to the item the HID report parser is currently working with\r
*\r
* \return Boolean true if the item should be stored into the HID report structure, false if it should be discarded\r
*/\r
-bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_Attributes_t* CurrentItemAttributes)\r
+bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem)\r
{\r
+ bool IsMouse = false;\r
+\r
+ /* Iterate through the item's collection path, until either the root collection node or a collection with the\r
+ * Mouse Usage is found - this prevents Joysticks, which use identical descriptors except for the Joystick usage\r
+ * parent node, from being erroneously treated as a mouse by the demo\r
+ */\r
+ for (HID_CollectionPath_t* CurrPath = CurrentItem->CollectionPath; CurrPath != NULL; CurrPath = CurrPath->Parent)\r
+ {\r
+ if ((CurrPath->Usage.Page == USAGE_PAGE_GENERIC_DCTRL) &&\r
+ (CurrPath->Usage.Usage == USAGE_MOUSE))\r
+ {\r
+ IsMouse = true;\r
+ break;\r
+ }\r
+ }\r
+\r
+ /* If a collection with the mouse usage was not found, indicate that we are not interested in this item */\r
+ if (!IsMouse)\r
+ return false;\r
+\r
/* Check the attributes of the current item - see if we are interested in it or not;\r
* only store BUTTON and GENERIC_DESKTOP_CONTROL items into the Processed HID Report\r
* structure to save RAM and ignore the rest\r
*/\r
- return ((CurrentItemAttributes->Usage.Page == USAGE_PAGE_BUTTON) ||\r
- (CurrentItemAttributes->Usage.Page == USAGE_PAGE_GENERIC_DCTRL))\r
+ return ((CurrentItem->Attributes.Usage.Page == USAGE_PAGE_BUTTON) ||\r
+ (CurrentItem->Attributes.Usage.Page == USAGE_PAGE_GENERIC_DCTRL));\r
}\r
projects / pub / USBasp.git / blobdiff