Fixed broken USB_GetNextDescriptor() function causing the descriptor to jump ahead...

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

diff --git a/Demos/Host/ClassDriver/MouseHost/MouseHost.c b/Demos/Host/ClassDriver/MouseHost/MouseHost.c
index 65fb489..c46bfe9 100644 (file)
--- a/Demos/Host/ClassDriver/MouseHost/MouseHost.c
+++ b/Demos/Host/ClassDriver/MouseHost/MouseHost.c
@@ -45,16 +45,18 @@ 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
                                \r

-                               .MatchInterfaceProtocol = true,\r
-                               .HIDInterfaceProtocol   = 0x02,\r
+                               .HIDInterfaceProtocol   = HID_BOOT_MOUSE_PROTOCOL,\r

                        },\r
        };\r
 \r
        \r
 /** Main program entry point. This routine configures the hardware required by the application, then\r
                        },\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
  */\r
 int main(void)\r
 {\r


@@ -74,9 +76,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, NULL) != HOST_SENDCONTROL_Successful) ||\r
-                                   (ConfigDescriptorSize > sizeof(ConfigDescriptorData)) ||\r
-                                       (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData)))\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


@@ -100,16 +101,45 @@ int main(void)
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;\r
                                }\r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;\r
                                }\r

+\r
+                               if (HID_Host_SetBootProtocol(&Mouse_HID_Interface) != 0)\r
+                               {\r
+                                       printf("Could not Set Boot Protocol Mode.\r\n");\r
+                                       LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+                                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+                                       break;\r
+                               }\r

                                \r
                                printf("Mouse Enumerated.\r\n");\r
                                USB_HostState = HOST_STATE_Configured;\r
                                break;\r
                        case HOST_STATE_Configured:\r
                                \r
                                printf("Mouse Enumerated.\r\n");\r
                                USB_HostState = HOST_STATE_Configured;\r
                                break;\r
                        case HOST_STATE_Configured:\r

-                               if (HID_Host_ReportReceived(&Mouse_HID_Interface))\r
+                               if (HID_Host_IsReportReceived(&Mouse_HID_Interface))\r

                                {\r
                                {\r

+                                       uint8_t LEDMask  = LEDS_NO_LEDS;\r
+                               \r
+                                       USB_MouseReport_Data_t MouseReport;\r
+                                       HID_Host_ReceiveReport(&Mouse_HID_Interface, &MouseReport);\r

                                        \r
                                        \r

+                                       printf_P(PSTR("dX:%2d dY:%2d Button:%d\r\n"), MouseReport.X,\r
+                                                                                                                                 MouseReport.Y,\r
+                                                                                                                                 MouseReport.Button);\r
+                                       if (MouseReport.X > 0)\r
+                                         LEDMask |= LEDS_LED1;\r
+                                       else if (MouseReport.X < 0)\r
+                                         LEDMask |= LEDS_LED2;\r
+                                               \r
+                                       if (MouseReport.Y > 0)\r
+                                         LEDMask |= LEDS_LED3;\r
+                                       else if (MouseReport.Y < 0)\r
+                                         LEDMask |= LEDS_LED4;\r
+\r
+                                       if (MouseReport.Button)\r
+                                         LEDMask  = LEDS_ALL_LEDS;\r
+\r
+                                       LEDs_SetAllLEDs(LEDMask);\r

                                }\r
                                }\r

-                       \r
+                               \r

                                break;\r
                }\r
        \r
                                break;\r
                }\r
        \r