Added CPU Usage monitor host app to the LEDNotifier project.

[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 8133c87..938dc26 100644 (file)
--- a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
@@ -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


@@ -58,7 +61,7 @@ USB_ClassInfo_HID_Host_t Mouse_HID_Interface =
 \r
        \r
 /** Main program entry point. This routine configures the hardware required by the application, then\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
  */\r
 int main(void)\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


@@ -104,9 +107,9 @@ int main(void)
                                        break;\r
                                }\r
 \r
                                        break;\r
                                }\r
 \r

-                               if (USB_HID_Host_SetReportProtocol(&Mouse_HID_Interface) != 0)\r
+                               if (HID_Host_SetReportProtocol(&Mouse_HID_Interface) != 0)\r

                                {\r
                                {\r

-                                       printf("Could not Set Report Protocol Mode.\r\n");\r
+                                       printf("Error Setting Report Protocol Mode or Not a Valid Mouse.\r\n");\r

                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;\r


@@ -114,13 +117,13 @@ int main(void)
                                \r
                                LEDs_SetAllLEDs(LEDS_NO_LEDS);\r
                                \r
                                \r
                                LEDs_SetAllLEDs(LEDS_NO_LEDS);\r
                                \r

-                               printf("HID Device Enumerated.\r\n");\r
+                               printf("Mouse Enumerated.\r\n");\r

                                USB_HostState = HOST_STATE_Configured;\r
                                break;\r
                        case HOST_STATE_Configured:\r
                                if (HID_Host_IsReportReceived(&Mouse_HID_Interface))\r
                                {\r
                                USB_HostState = HOST_STATE_Configured;\r
                                break;\r
                        case HOST_STATE_Configured:\r
                                if (HID_Host_IsReportReceived(&Mouse_HID_Interface))\r
                                {\r

-                                       uint8_t MouseReport[50];\r
+                                       uint8_t MouseReport[Mouse_HID_Interface.State.LargestReportSize];\r

                                        HID_Host_ReceiveReport(&Mouse_HID_Interface, &MouseReport);\r
 \r
                                        uint8_t LEDMask = LEDS_NO_LEDS;\r
                                        HID_Host_ReceiveReport(&Mouse_HID_Interface, &MouseReport);\r
 \r
                                        uint8_t LEDMask = LEDS_NO_LEDS;\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


@@ -250,21 +268,36 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8
  *  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
  *  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 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
  *\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
 {\r

-       /* Check the attributes of the current item - see if we are interested in it or not */\r
-       if ((CurrentItemAttributes->Usage.Page == USAGE_PAGE_BUTTON) ||\r
-           (CurrentItemAttributes->Usage.Page == USAGE_PAGE_GENERIC_DCTRL))\r
-       {\r
-               /* Only store BUTTON and GENERIC_DESKTOP_CONTROL items into the Processed HID Report structure to save RAM */\r
-               return true;\r
-       }\r
-       else\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
        {\r

-               return false;\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

+\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 ((CurrentItem->Attributes.Usage.Page == USAGE_PAGE_BUTTON) ||\r
+               (CurrentItem->Attributes.Usage.Page == USAGE_PAGE_GENERIC_DCTRL));\r

 }\r
 }\r