Added ENABLE_TELNET_SERVER compile time option to the Webserver project to disable...

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

diff --git a/Projects/MissileLauncher/MissileLauncher.c b/Projects/MissileLauncher/MissileLauncher.c
index 2782b69..a186732 100644 (file)
--- a/Projects/MissileLauncher/MissileLauncher.c
+++ b/Projects/MissileLauncher/MissileLauncher.c
@@ -1,14 +1,6 @@
 /*\r
 /*\r

-             LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
-              \r
-  dean [at] fourwalledcubicle [dot] com\r
-      www.fourwalledcubicle.com\r
-*/\r
-\r
-/*\r

          USB Missile Launcher Demo\r
          USB Missile Launcher Demo\r

-        Copyright (C) Dave Fletcher, 2009.\r
+        Copyright (C) Dave Fletcher, 2010.\r

          fletch at fletchtronics dot net\r
          \r
         Based on research by Scott Weston at\r
          fletch at fletchtronics dot net\r
          \r
         Based on research by Scott Weston at\r


@@ -16,16 +8,16 @@
  */\r
 \r
 /*\r
  */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-  Copyright 2009  Dave Fletcher (fletch [at] fletchtronics [dot] net)\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
+  Copyright 2010  Dave Fletcher (fletch [at] fletchtronics [dot] net)\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


@@ -54,40 +46,40 @@
 #include "MissileLauncher.h"\r
 \r
 /** Launcher first init command report data sequence */\r
 #include "MissileLauncher.h"\r
 \r
 /** Launcher first init command report data sequence */\r

-static const uint8_t CMD_INITA[8]     = {  85, 83, 66, 67,  0,  0,  4,  0  };\r
+uint8_t CMD_INITA[8]     = {  85, 83, 66, 67,  0,  0,  4,  0  };\r

 \r
 /** Launcher second init command report data sequence */\r
 \r
 /** Launcher second init command report data sequence */\r

-static const uint8_t CMD_INITB[8]     = {  85, 83, 66, 67,  0, 64,  2,  0  };\r
+uint8_t CMD_INITB[8]     = {  85, 83, 66, 67,  0, 64,  2,  0  };\r

 \r
 /** Launcher command report data sequence to stop all movement */\r
 \r
 /** Launcher command report data sequence to stop all movement */\r

-static const uint8_t CMD_STOP[8]      = {   0,  0,  0,  0,  0,  0,  8,  8  };\r
+uint8_t CMD_STOP[8]      = {   0,  0,  0,  0,  0,  0,  8,  8  };\r

 \r
 /** Launcher command report data sequence to move left */\r
 \r
 /** Launcher command report data sequence to move left */\r

-static const uint8_t CMD_LEFT[8]      = {   0,  1,  0,  0,  0,  0,  8,  8  };\r
+uint8_t CMD_LEFT[8]      = {   0,  1,  0,  0,  0,  0,  8,  8  };\r

 \r
 /** Launcher command report data sequence to move right */\r
 \r
 /** Launcher command report data sequence to move right */\r

-static const uint8_t CMD_RIGHT[8]     = {   0,  0,  1,  0,  0,  0,  8,  8  };\r
+uint8_t CMD_RIGHT[8]     = {   0,  0,  1,  0,  0,  0,  8,  8  };\r

 \r
 /** Launcher command report data sequence to move up */\r
 \r
 /** Launcher command report data sequence to move up */\r

-static const uint8_t CMD_UP[8]        = {   0,  0,  0,  1,  0,  0,  8,  8  };\r
+uint8_t CMD_UP[8]        = {   0,  0,  0,  1,  0,  0,  8,  8  };\r

 \r
 /** Launcher command report data sequence to move down */\r
 \r
 /** Launcher command report data sequence to move down */\r

-static const uint8_t CMD_DOWN[8]      = {   0,  0,  0,  0,  1,  0,  8,  8  };\r
+uint8_t CMD_DOWN[8]      = {   0,  0,  0,  0,  1,  0,  8,  8  };\r

 \r
 /** Launcher command report data sequence to move left and up */\r
 \r
 /** Launcher command report data sequence to move left and up */\r

-static const uint8_t CMD_LEFTUP[8]    = {   0,  1,  0,  1,  0,  0,  8,  8  };\r
+uint8_t CMD_LEFTUP[8]    = {   0,  1,  0,  1,  0,  0,  8,  8  };\r

 \r
 /** Launcher command report data sequence to move right and up */\r
 \r
 /** Launcher command report data sequence to move right and up */\r

-static const uint8_t CMD_RIGHTUP[8]   = {   0,  0,  1,  1,  0,  0,  8,  8  };\r
+uint8_t CMD_RIGHTUP[8]   = {   0,  0,  1,  1,  0,  0,  8,  8  };\r

 \r
 /** Launcher command report data sequence to move left and down */\r
 \r
 /** Launcher command report data sequence to move left and down */\r

-static const uint8_t CMD_LEFTDOWN[8]  = {   0,  1,  0,  0,  1,  0,  8,  8  };\r
+uint8_t CMD_LEFTDOWN[8]  = {   0,  1,  0,  0,  1,  0,  8,  8  };\r

 \r
 /** Launcher command report data sequence to move right and down */\r
 \r
 /** Launcher command report data sequence to move right and down */\r

-static const uint8_t CMD_RIGHTDOWN[8] = {   0,  0,  1,  0,  1,  0,  8,  8  };\r
+uint8_t CMD_RIGHTDOWN[8] = {   0,  0,  1,  0,  1,  0,  8,  8  };\r

 \r
 /** Launcher command report data sequence to fire a missile */\r
 \r
 /** Launcher command report data sequence to fire a missile */\r

-static const uint8_t CMD_FIRE[8]      = {   0,  0,  0,  0,  0,  1,  8,  8  };\r
+uint8_t CMD_FIRE[8]      = {   0,  0,  0,  0,  0,  1,  8,  8  };\r

 \r
 /** Last command sent to the launcher, to determine what new command (if any) must be sent */\r
 uint8_t* CmdState;\r
 \r
 /** Last command sent to the launcher, to determine what new command (if any) must be sent */\r
 uint8_t* CmdState;\r


@@ -97,7 +89,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 +129,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


@@ -154,25 +147,25 @@ void Read_Joystick_Status(void)
 \r
 /** Lower level send routine, copies report into a larger buffer and sends.\r
  *\r
 \r
 /** Lower level send routine, copies report into a larger buffer and sends.\r
  *\r

- *  \param Report  Report data to send.\r
- *  \param ReportSize  Report length in bytes.\r
+ *  \param[in] Report  Report data to send.\r
+ *  \param[in] ReportSize  Report length in bytes.\r

  */\r
  */\r

-void Send_Command_Report(uint8_t *Report, uint16_t ReportSize)\r
+void Send_Command_Report(uint8_t* const Report, const uint16_t ReportSize)\r

 {\r
        memcpy(CmdBuffer, Report, 8);\r
        WriteNextReport(CmdBuffer, ReportSize);\r
 }\r
 \r
 {\r
        memcpy(CmdBuffer, Report, 8);\r
        WriteNextReport(CmdBuffer, ReportSize);\r
 }\r
 \r

-/** Send one of the CMD_* command constants listed above.\r
+/** Sends one of the CMD_* command constants to the attached device.\r

  *\r
  *\r

- *  \param Command  One of the command constants.\r
+ *  \param[in] Command  One of the command constants.\r

  */\r
  */\r

-void Send_Command(uint8_t* Command)\r
+void Send_Command(uint8_t* const Command)\r

 {\r
        if ((CmdState == CMD_STOP && Command != CMD_STOP) ||\r
                (CmdState != CMD_STOP && Command == CMD_STOP))\r
        {\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 +178,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 +186,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 +194,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 +211,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


@@ -248,10 +241,10 @@ void DiscardNextReport(void)
 \r
 /** Writes a report to the attached device.\r
  *\r
 \r
 /** Writes a report to the attached device.\r
  *\r

- *  \param ReportOUTData  Buffer containing the report to send to the device\r
- *  \param ReportLength  Length of the report to send\r
+ *  \param[in] ReportOUTData  Buffer containing the report to send to the device\r
+ *  \param[in] ReportLength  Length of the report to send\r

  */\r
  */\r

-void WriteNextReport(uint8_t* ReportOUTData, uint16_t ReportLength)\r
+void WriteNextReport(uint8_t* const ReportOUTData, const uint16_t ReportLength)\r

 {\r
        /* Select and unfreeze HID data OUT pipe */\r
        Pipe_SelectPipe(HID_DATA_OUT_PIPE);\r
 {\r
        /* Select and unfreeze HID data OUT pipe */\r
        Pipe_SelectPipe(HID_DATA_OUT_PIPE);\r


@@ -285,8 +278,8 @@ 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
-                               .bRequest      = 0x09,\r
+                               .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+                               .bRequest      = REQ_SetReport,\r

                                .wValue        = 0x02,\r
                                .wIndex        = 0x01,\r
                                .wLength       = ReportLength,\r
                                .wValue        = 0x02,\r
                                .wIndex        = 0x01,\r
                                .wLength       = ReportLength,\r


@@ -318,7 +311,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 +322,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