Removed software PDI/TPI emulation from the AVRISP-MKII clone project, as it was...

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

diff --git a/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.c b/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.c
index bf39420..7be38dd 100644 (file)
--- a/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.c
+++ b/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.c
@@ -70,6 +70,7 @@ int main(void)
        puts_P(PSTR(ESC_FG_CYAN "Joystick Host Demo running.\r\n" ESC_FG_WHITE));\r
 \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
        puts_P(PSTR(ESC_FG_CYAN "Joystick Host Demo running.\r\n" ESC_FG_WHITE));\r
 \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r

+       sei();\r

 \r
        for (;;)\r
        {\r
 \r
        for (;;)\r
        {\r


@@ -84,7 +85,7 @@ int main(void)
                                if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
                                                                       sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
                                {\r
                                if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
                                                                       sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
                                {\r

-                                       printf("Error Retrieving Configuration Descriptor.\r\n");\r
+                                       puts_P(PSTR("Error Retrieving Configuration Descriptor.\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


@@ -93,7 +94,7 @@ int main(void)
                                if (HID_Host_ConfigurePipes(&Joystick_HID_Interface,\r
                                                            ConfigDescriptorSize, ConfigDescriptorData) != HID_ENUMERROR_NoError)\r
                                {\r
                                if (HID_Host_ConfigurePipes(&Joystick_HID_Interface,\r
                                                            ConfigDescriptorSize, ConfigDescriptorData) != HID_ENUMERROR_NoError)\r
                                {\r

-                                       printf("Attached Device Not a Valid Joystick.\r\n");\r
+                                       puts_P(PSTR("Attached Device Not a Valid Joystick.\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


@@ -101,7 +102,7 @@ int main(void)
                                \r
                                if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)\r
                                {\r
                                \r
                                if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)\r
                                {\r

-                                       printf("Error Setting Device Configuration.\r\n");\r
+                                       puts_P(PSTR("Error Setting Device Configuration.\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


@@ -109,15 +110,14 @@ int main(void)
 \r
                                if (HID_Host_SetReportProtocol(&Joystick_HID_Interface) != 0)\r
                                {\r
 \r
                                if (HID_Host_SetReportProtocol(&Joystick_HID_Interface) != 0)\r
                                {\r

-                                       printf("Error Setting Report Protocol Mode or Not a Valid Joystick.\r\n");\r
+                                       puts_P(PSTR("Error Setting Report Protocol Mode or Not a Valid Joystick.\r\n"));\r

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

-                               LEDs_SetAllLEDs(LEDS_NO_LEDS);\r
-                               \r
-                               printf("Joystick Enumerated.\r\n");\r
+                               puts_P(PSTR("Joystick Enumerated.\r\n"));\r
+                               LEDs_SetAllLEDs(LEDMASK_USB_READY);\r

                                USB_HostState = HOST_STATE_Configured;\r
                                break;\r
                        case HOST_STATE_Configured:\r
                                USB_HostState = HOST_STATE_Configured;\r
                                break;\r
                        case HOST_STATE_Configured:\r


@@ -132,15 +132,14 @@ int main(void)
                                        {\r
                                                HID_ReportItem_t* ReportItem = &HIDReportInfo.ReportItems[ReportNumber];\r
                                                \r
                                        {\r
                                                HID_ReportItem_t* ReportItem = &HIDReportInfo.ReportItems[ReportNumber];\r
                                                \r

+                                               /* Update the report item value if it is contained within the current report */\r
+                                               if (!(USB_GetHIDReportItemInfo(JoystickReport, ReportItem)))\r
+                                                 continue;\r
+\r
+                                               /* Determine what report item is being tested, process updated value as needed */\r

                                                if ((ReportItem->Attributes.Usage.Page        == USAGE_PAGE_BUTTON) &&\r
                                                        (ReportItem->ItemType                     == REPORT_ITEM_TYPE_In))\r
                                                {\r
                                                if ((ReportItem->Attributes.Usage.Page        == USAGE_PAGE_BUTTON) &&\r
                                                        (ReportItem->ItemType                     == REPORT_ITEM_TYPE_In))\r
                                                {\r

-                                                       /* Get the joystick button value if it is contained within the current report, if not,\r
-                                                        * skip to the next item in the parser list\r
-                                                        */\r
-                                                       if (!(USB_GetHIDReportItemInfo(JoystickReport, ReportItem)))\r
-                                                         continue;\r
-\r

                                                        if (ReportItem->Value)\r
                                                          LEDMask = LEDS_ALL_LEDS;\r
                                                }\r
                                                        if (ReportItem->Value)\r
                                                          LEDMask = LEDS_ALL_LEDS;\r
                                                }\r


@@ -149,12 +148,6 @@ int main(void)
                                                                  (ReportItem->Attributes.Usage.Usage == USAGE_Y))                 &&\r
                                                                 (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))\r
                                                {\r
                                                                  (ReportItem->Attributes.Usage.Usage == USAGE_Y))                 &&\r
                                                                 (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))\r
                                                {\r

-                                                       /* Get the joystick relative position 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(JoystickReport, ReportItem)))\r
-                                                         continue;                                                       \r
-\r

                                                        int16_t DeltaMovement = (int16_t)(ReportItem->Value << (16 - ReportItem->Attributes.BitSize));\r
                                                        \r
                                                        if (ReportItem->Attributes.Usage.Usage == USAGE_X)\r
                                                        int16_t DeltaMovement = (int16_t)(ReportItem->Value << (16 - ReportItem->Attributes.BitSize));\r
                                                        \r
                                                        if (ReportItem->Attributes.Usage.Usage == USAGE_X)\r