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

[pub/USBasp.git] / Projects / MissileLauncher / MissileLauncher.c

diff --git a/Projects/MissileLauncher/MissileLauncher.c b/Projects/MissileLauncher/MissileLauncher.c
index 192ca33..a16d313 100644 (file)
--- a/Projects/MissileLauncher/MissileLauncher.c
+++ b/Projects/MissileLauncher/MissileLauncher.c
@@ -97,7 +97,7 @@ uint8_t  CmdBuffer[LAUNCHER_CMD_BUFFER_SIZE];
 \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


@@ -137,8 +137,9 @@ void SetupHardware(void)
 void Read_Joystick_Status(void)\r
 {\r
        uint8_t JoyStatus_LCL = Joystick_GetStatus();\r
 void Read_Joystick_Status(void)\r
 {\r
        uint8_t JoyStatus_LCL = Joystick_GetStatus();\r

+       uint8_t Buttons_LCL   = Buttons_GetStatus();\r

 \r
 \r

-       if (BUTTONS_BUTTON1 && Buttons_GetStatus())\r
+       if (Buttons_LCL & BUTTONS_BUTTON1)\r

          Send_Command(CMD_FIRE);\r
        else if (JoyStatus_LCL & JOY_UP)\r
          Send_Command(CMD_UP);\r
          Send_Command(CMD_FIRE);\r
        else if (JoyStatus_LCL & JOY_UP)\r
          Send_Command(CMD_UP);\r


@@ -172,7 +173,7 @@ void Send_Command(uint8_t* Command)
        if ((CmdState == CMD_STOP && Command != CMD_STOP) ||\r
                (CmdState != CMD_STOP && Command == CMD_STOP))\r
        {\r
        if ((CmdState == CMD_STOP && Command != CMD_STOP) ||\r
                (CmdState != CMD_STOP && Command == CMD_STOP))\r
        {\r

-               LEDs_ChangeLEDs(LEDS_LED4, ~LEDs_GetLEDs() & LEDS_LED4);\r
+               LEDs_ToggleLEDs(LEDS_LED4);\r

 \r
                Send_Command_Report(CMD_INITA, 8);\r
                Send_Command_Report(CMD_INITB, 8);\r
 \r
                Send_Command_Report(CMD_INITA, 8);\r
                Send_Command_Report(CMD_INITB, 8);\r


@@ -185,7 +186,7 @@ void Send_Command(uint8_t* Command)
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and\r
  *  starts the library USB task to begin the enumeration and USB management process.\r
  */\r
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and\r
  *  starts the library USB task to begin the enumeration and USB management process.\r
  */\r

-void EVENT_USB_DeviceAttached(void)\r
+void EVENT_USB_Host_DeviceAttached(void)\r

 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 }\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 }\r


@@ -193,7 +194,7 @@ void EVENT_USB_DeviceAttached(void)
 /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and\r
  *  stops the library USB task management process.\r
  */\r
 /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and\r
  *  stops the library USB task management process.\r
  */\r

-void EVENT_USB_DeviceUnattached(void)\r
+void EVENT_USB_Host_DeviceUnattached(void)\r

 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 }\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 }\r


@@ -201,13 +202,13 @@ void EVENT_USB_DeviceUnattached(void)
 /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully\r
  *  enumerated by the host and is now ready to be used by the application.\r
  */\r
 /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully\r
  *  enumerated by the host and is now ready to be used by the application.\r
  */\r

-void EVENT_USB_DeviceEnumerationComplete(void)\r
+void EVENT_USB_Host_DeviceEnumerationComplete(void)\r

 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 }\r
 \r
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 }\r
 \r
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */\r

-void EVENT_USB_HostError(const uint8_t ErrorCode)\r
+void EVENT_USB_Host_HostError(const uint8_t ErrorCode)\r

 {\r
        USB_ShutDown();\r
 \r
 {\r
        USB_ShutDown();\r
 \r


@@ -218,7 +219,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while\r
  *  enumerating an attached USB device.\r
  */\r
 /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while\r
  *  enumerating an attached USB device.\r
  */\r

-void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)\r
+void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)\r

 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r


@@ -285,7 +286,7 @@ void WriteNextReport(uint8_t* ReportOUTData, uint16_t ReportLength)
                /* Class specific request to send a HID report to the device */\r
                USB_ControlRequest = (USB_Request_Header_t)\r
                        {\r
                /* Class specific request to send a HID report to the device */\r
                USB_ControlRequest = (USB_Request_Header_t)\r
                        {\r

-                               .bmRequestType = 0x21,\r
+                               .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r

                                .bRequest      = 0x09,\r
                                .wValue        = 0x02,\r
                                .wIndex        = 0x01,\r
                                .bRequest      = 0x09,\r
                                .wValue        = 0x02,\r
                                .wIndex        = 0x01,\r


@@ -318,7 +319,7 @@ void HID_Host_Task(void)
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
                                /* Wait until USB device disconnected */\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
                                /* Wait until USB device disconnected */\r

-                               while (USB_IsConnected);\r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

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


@@ -329,16 +330,13 @@ void HID_Host_Task(void)
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                \r
                                /* Wait until USB device disconnected */\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                \r
                                /* Wait until USB device disconnected */\r

-                               while (USB_IsConnected);\r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

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

-                       USB_HostState = HOST_STATE_Ready;\r
-                       break;\r
-               case HOST_STATE_Ready:\r

                        DiscardNextReport();\r
 \r
                        break;\r
                        DiscardNextReport();\r
 \r
                        break;\r