Add FatFS library to the Webserver project, extend the HTTP server so that it now...

[pub/USBasp.git] / Demos / Host / ClassDriver / MouseHostWithParser / MouseHostWithParser.c

diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
index b9edee1..db176e5 100644 (file)
--- a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\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
               \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
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -48,7 +48,10 @@ USB_ClassInfo_HID_Host_t Mouse_HID_Interface =
                .Config =\r
                        {\r
                                .DataINPipeNumber       = 1,\r
                .Config =\r
                        {\r
                                .DataINPipeNumber       = 1,\r

+                               .DataINPipeDoubleBank   = false,\r
+\r

                                .DataOUTPipeNumber      = 2,\r
                                .DataOUTPipeNumber      = 2,\r

+                               .DataOUTPipeDoubleBank  = false,\r

                                \r
                                .HIDInterfaceProtocol   = HID_NON_BOOT_PROTOCOL,\r
                                \r
                                \r
                                .HIDInterfaceProtocol   = HID_NON_BOOT_PROTOCOL,\r
                                \r


@@ -78,8 +81,8 @@ int main(void)
                                uint16_t ConfigDescriptorSize;\r
                                uint8_t  ConfigDescriptorData[512];\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
                                {\r
                                        printf("Error Retrieving Configuration Descriptor.\r\n");\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r


@@ -142,6 +145,21 @@ int main(void)
                                                          LEDMask = LEDS_ALL_LEDS;\r
                                                }\r
                                                else if ((ReportItem->Attributes.Usage.Page   == USAGE_PAGE_GENERIC_DCTRL) &&\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
                                                                 ((ReportItem->Attributes.Usage.Usage == USAGE_X)                  ||\r
                                                                  (ReportItem->Attributes.Usage.Usage == USAGE_Y))                 &&\r
                                                                 (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))\r


@@ -260,7 +278,7 @@ bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem)
 \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
 \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 erronously treated as a mouse\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
         */\r
        for (HID_CollectionPath_t* CurrPath = CurrentItem->CollectionPath; CurrPath != NULL; CurrPath = CurrPath->Parent)\r
        {\r