Add USB_STRING_DESCRIPTOR and make the Keyboard demo use it.

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

diff --git a/Projects/MissileLauncher/MissileLauncher.c b/Projects/MissileLauncher/MissileLauncher.c
index 135fa2c..5607d4a 100644 (file)
--- a/Projects/MissileLauncher/MissileLauncher.c
+++ b/Projects/MissileLauncher/MissileLauncher.c
@@ -8,7 +8,7 @@
  */
 
 /*
  */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2014  Dean Camera (dean [at] fourwalledcubicle [dot] com)

   Copyright 2010  Dave Fletcher (fletch [at] fletchtronics [dot] net)
 
   Permission to use, copy, modify, distribute, and sell this
   Copyright 2010  Dave Fletcher (fletch [at] fletchtronics [dot] net)
 
   Permission to use, copy, modify, distribute, and sell this


@@ -20,7 +20,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 

-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this

   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 
 /** Last command sent to the launcher, to determine what new command (if any) must be sent */
 
 /** Last command sent to the launcher, to determine what new command (if any) must be sent */

-uint8_t* CmdState;
+static const uint8_t* CmdState;

 
 /** Buffer to hold a command to send to the launcher */
 
 /** Buffer to hold a command to send to the launcher */

-uint8_t  CmdBuffer[LAUNCHER_CMD_BUFFER_SIZE];
+static uint8_t CmdBuffer[LAUNCHER_CMD_BUFFER_SIZE];

 
 
 /** Main program entry point. This routine configures the hardware required by the application, then
 
 
 /** Main program entry point. This routine configures the hardware required by the application, then


@@ -98,13 +98,13 @@ int main(void)
        CmdState = CMD_STOP;
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        CmdState = CMD_STOP;
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

-       sei();
+       GlobalInterruptEnable();

 
        for (;;)
        {
                Read_Joystick_Status();
 
        for (;;)
        {
                Read_Joystick_Status();

+               DiscardNextReport();

 
 

-               HID_Host_Task();

                USB_USBTask();
        }
 }
                USB_USBTask();
        }
 }


@@ -112,12 +112,14 @@ int main(void)
 /** Configures the board hardware and chip peripherals for the demo's functionality. */
 void SetupHardware(void)
 {
 /** Configures the board hardware and chip peripherals for the demo's functionality. */
 void SetupHardware(void)
 {

+#if (ARCH == ARCH_AVR8)

        /* Disable watchdog if enabled by bootloader/fuses */
        MCUSR &= ~(1 << WDRF);
        wdt_disable();
 
        /* Disable clock division */
        clock_prescale_set(clock_div_1);
        /* Disable watchdog if enabled by bootloader/fuses */
        MCUSR &= ~(1 << WDRF);
        wdt_disable();
 
        /* Disable clock division */
        clock_prescale_set(clock_div_1);

+#endif

 
        /* Hardware Initialization */
        LEDs_Init();
 
        /* Hardware Initialization */
        LEDs_Init();


@@ -151,18 +153,18 @@ void Read_Joystick_Status(void)
  *  \param[in] Report  Report data to send.
  *  \param[in] ReportSize  Report length in bytes.
  */
  *  \param[in] Report  Report data to send.
  *  \param[in] ReportSize  Report length in bytes.
  */

-void Send_Command_Report(uint8_t* const Report,
+void Send_Command_Report(const uint8_t* const Report,

                          const uint16_t ReportSize)
 {
        memcpy(CmdBuffer, Report, 8);
        WriteNextReport(CmdBuffer, ReportSize);
 }
 
                          const uint16_t ReportSize)
 {
        memcpy(CmdBuffer, Report, 8);
        WriteNextReport(CmdBuffer, ReportSize);
 }
 

-/** Sends one of the CMD_* command constants to the attached device.
+/** Sends one of the \c CMD_* command constants to the attached device.

  *
  *  \param[in] Command  One of the command constants.
  */
  *
  *  \param[in] Command  One of the command constants.
  */

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

 {
        if ((CmdState == CMD_STOP && Command != CMD_STOP) ||
                (CmdState != CMD_STOP && Command == CMD_STOP))
 {
        if ((CmdState == CMD_STOP && Command != CMD_STOP) ||
                (CmdState != CMD_STOP && Command == CMD_STOP))


@@ -198,13 +200,29 @@ void EVENT_USB_Host_DeviceUnattached(void)
  */
 void EVENT_USB_Host_DeviceEnumerationComplete(void)
 {
  */
 void EVENT_USB_Host_DeviceEnumerationComplete(void)
 {

+       LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
+
+       /* Get and process the configuration descriptor data */
+       if (ProcessConfigurationDescriptor() != SuccessfulConfigRead)
+       {
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+               return;
+       }
+
+       /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */
+       if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
+       {
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+               return;
+       }
+

        LEDs_SetAllLEDs(LEDMASK_USB_READY);
 }
 
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
 void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
 {
        LEDs_SetAllLEDs(LEDMASK_USB_READY);
 }
 
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
 void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
 {

-       USB_ShutDown();
+       USB_Disable();

 
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
        for(;;);
 
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
        for(;;);


@@ -222,6 +240,9 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode,
 /** Reads in and discards the next report from the attached device. */
 void DiscardNextReport(void)
 {
 /** Reads in and discards the next report from the attached device. */
 void DiscardNextReport(void)
 {

+       if (USB_HostState != HOST_STATE_Configured)
+         return;
+

        /* Select and unfreeze HID data IN pipe */
        Pipe_SelectPipe(HID_DATA_IN_PIPE);
        Pipe_Unfreeze();
        /* Select and unfreeze HID data IN pipe */
        Pipe_SelectPipe(HID_DATA_IN_PIPE);
        Pipe_Unfreeze();


@@ -250,6 +271,9 @@ void DiscardNextReport(void)
 void WriteNextReport(uint8_t* const ReportOUTData,
                      const uint16_t ReportLength)
 {
 void WriteNextReport(uint8_t* const ReportOUTData,
                      const uint16_t ReportLength)
 {

+       if (USB_HostState != HOST_STATE_Configured)
+         return;
+

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


@@ -269,7 +293,7 @@ void WriteNextReport(uint8_t* const ReportOUTData,
                }
 
                /* Write out HID report data */
                }
 
                /* Write out HID report data */

-               Pipe_Write_Stream_LE(ReportOUTData, ReportLength);
+               Pipe_Write_Stream_LE(ReportOUTData, ReportLength, NULL);

 
                /* Clear the OUT endpoint, send last data packet */
                Pipe_ClearOUT();
 
                /* Clear the OUT endpoint, send last data packet */
                Pipe_ClearOUT();


@@ -297,45 +321,3 @@ void WriteNextReport(uint8_t* const ReportOUTData,
        }
 }
 
        }
 }
 

-/** Task to set the configuration of the attached device after it has been enumerated, and to read and process
- *  HID reports from the device and to send reports if desired.
- */
-void HID_Host_Task(void)
-{
-       uint8_t ErrorCode;
-
-       /* Switch to determine what user-application handled host state the host state machine is in */
-       switch (USB_HostState)
-       {
-               case HOST_STATE_Addressed:
-                       /* Get and process the configuration descriptor data */
-                       if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)
-                       {
-                               /* Indicate error status */
-                               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-
-                               /* Wait until USB device disconnected */
-                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-                               break;
-                       }
-
-                       /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */
-                       if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)
-                       {
-                               /* Indicate error status */
-                               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-
-                               /* Wait until USB device disconnected */
-                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-                               break;
-                       }
-
-                       USB_HostState = HOST_STATE_Configured;
-                       break;
-               case HOST_STATE_Configured:
-                       DiscardNextReport();
-
-                       break;
-       }
-}
-