Commit for the 091122 release.

[pub/USBasp.git] / Demos / Device / LowLevel / DualCDC / DualCDC.c

diff --git a/Demos/Device/LowLevel/DualCDC/DualCDC.c b/Demos/Device/LowLevel/DualCDC/DualCDC.c
index 7a84c8d..8b1da03 100644 (file)
--- a/Demos/Device/LowLevel/DualCDC/DualCDC.c
+++ b/Demos/Device/LowLevel/DualCDC/DualCDC.c
@@ -36,7 +36,6 @@
  \r
 #include "DualCDC.h"\r
 \r
  \r
 #include "DualCDC.h"\r
 \r

-/* Globals: */\r

 /** Contains the current baud rate and other settings of the first virtual serial port. While this demo does not use\r
  *  the physical USART and thus does not use these settings, they must still be retained and returned to the host\r
  *  upon request or the host will assume the device is non-functional.\r
 /** Contains the current baud rate and other settings of the first virtual serial port. While this demo does not use\r
  *  the physical USART and thus does not use these settings, they must still be retained and returned to the host\r
  *  upon request or the host will assume the device is non-functional.\r


@@ -63,8 +62,9 @@ CDC_Line_Coding_t LineEncoding2 = { .BaudRateBPS = 0,
                                     .ParityType  = Parity_None,\r
                                     .DataBits    = 8            };\r
 \r
                                     .ParityType  = Parity_None,\r
                                     .DataBits    = 8            };\r
 \r

+\r

 /** Main program entry point. This routine configures the hardware required by the application, then\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


@@ -230,14 +230,6 @@ void CDC1_Task(void)
        char*       ReportString    = NULL;\r
        uint8_t     JoyStatus_LCL   = Joystick_GetStatus();\r
        static bool ActionSent      = false;\r
        char*       ReportString    = NULL;\r
        uint8_t     JoyStatus_LCL   = Joystick_GetStatus();\r
        static bool ActionSent      = false;\r

-       char*       JoystickStrings[] =\r
-                                       {\r
-                                               "Joystick Up\r\n",\r
-                                               "Joystick Down\r\n",\r
-                                               "Joystick Left\r\n",\r
-                                               "Joystick Right\r\n",\r
-                                               "Joystick Pressed\r\n",\r
-                                       };\r

        \r
        /* Device must be connected and configured for the task to run */\r
        if (USB_DeviceState != DEVICE_STATE_Configured)\r
        \r
        /* Device must be connected and configured for the task to run */\r
        if (USB_DeviceState != DEVICE_STATE_Configured)\r


@@ -245,22 +237,20 @@ void CDC1_Task(void)
 \r
        /* Determine if a joystick action has occurred */\r
        if (JoyStatus_LCL & JOY_UP)\r
 \r
        /* Determine if a joystick action has occurred */\r
        if (JoyStatus_LCL & JOY_UP)\r

-         ReportString = JoystickStrings[0];\r
+         ReportString = "Joystick Up\r\n";\r

        else if (JoyStatus_LCL & JOY_DOWN)\r
        else if (JoyStatus_LCL & JOY_DOWN)\r

-         ReportString = JoystickStrings[1];\r
+         ReportString = "Joystick Down\r\n";\r

        else if (JoyStatus_LCL & JOY_LEFT)\r
        else if (JoyStatus_LCL & JOY_LEFT)\r

-         ReportString = JoystickStrings[2];\r
+         ReportString = "Joystick Left\r\n";\r

        else if (JoyStatus_LCL & JOY_RIGHT)\r
        else if (JoyStatus_LCL & JOY_RIGHT)\r

-         ReportString = JoystickStrings[3];\r
+         ReportString = "Joystick Right\r\n";\r

        else if (JoyStatus_LCL & JOY_PRESS)\r
        else if (JoyStatus_LCL & JOY_PRESS)\r

-         ReportString = JoystickStrings[4];\r
+         ReportString = "Joystick Pressed\r\n";\r
+       else\r
+         ActionSent = false;\r

 \r
        /* Flag management - Only allow one string to be sent per action */\r
 \r
        /* Flag management - Only allow one string to be sent per action */\r

-       if (ReportString == NULL)\r
-       {\r
-               ActionSent = false;\r
-       }\r
-       else if ((ActionSent == false) && LineEncoding1.BaudRateBPS)\r
+       if ((ReportString != NULL) && (ActionSent == false) && LineEncoding1.BaudRateBPS)\r

        {\r
                ActionSent = true;\r
                \r
        {\r
                ActionSent = true;\r
                \r