Simplify CDC device demos, by directly assigning the string to transmit to the pointe...

[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..efbecd6 100644 (file)
--- a/Demos/Device/LowLevel/DualCDC/DualCDC.c
+++ b/Demos/Device/LowLevel/DualCDC/DualCDC.c
@@ -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*       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
@@ -245,22 +237,20 @@ void CDC1_Task(void)
 \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
-         ReportString = JoystickStrings[1];\r
+         ReportString = "Joystick Down\r\n";\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
-         ReportString = JoystickStrings[3];\r
+         ReportString = "Joystick Right\r\n";\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
-       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