diff options
author | Dean Camera <[email protected]> | 2009-08-06 14:30:53 +0000 |
---|---|---|
committer | Dean Camera <[email protected]> | 2009-08-06 14:30:53 +0000 |
commit | 33a5715e91d7fe2c0c58351a4a973352ae0e01c9 (patch) | |
tree | f75e3726c93546ad6874b140c8769eabf192934d /Demos/Device/LowLevel/DualCDC/DualCDC.c | |
parent | c830fcb0e1d42c1300ebe78a8b33924054b63a87 (diff) | |
download | qmk_firmware-33a5715e91d7fe2c0c58351a4a973352ae0e01c9.tar.gz qmk_firmware-33a5715e91d7fe2c0c58351a4a973352ae0e01c9.zip |
Simplify CDC device demos, by directly assigning the string to transmit to the pointer, rather than using an intermediatary table to hold all the possible transmit strings.
Diffstat (limited to 'Demos/Device/LowLevel/DualCDC/DualCDC.c')
-rw-r--r-- | Demos/Device/LowLevel/DualCDC/DualCDC.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/Demos/Device/LowLevel/DualCDC/DualCDC.c b/Demos/Device/LowLevel/DualCDC/DualCDC.c index 7a84c8dcda..efbecd6cfd 100644 --- 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;
uint8_t JoyStatus_LCL = Joystick_GetStatus();
static bool ActionSent = false;
- char* JoystickStrings[] =
- {
- "Joystick Up\r\n",
- "Joystick Down\r\n",
- "Joystick Left\r\n",
- "Joystick Right\r\n",
- "Joystick Pressed\r\n",
- };
/* Device must be connected and configured for the task to run */
if (USB_DeviceState != DEVICE_STATE_Configured)
@@ -245,22 +237,20 @@ void CDC1_Task(void) /* Determine if a joystick action has occurred */
if (JoyStatus_LCL & JOY_UP)
- ReportString = JoystickStrings[0];
+ ReportString = "Joystick Up\r\n";
else if (JoyStatus_LCL & JOY_DOWN)
- ReportString = JoystickStrings[1];
+ ReportString = "Joystick Down\r\n";
else if (JoyStatus_LCL & JOY_LEFT)
- ReportString = JoystickStrings[2];
+ ReportString = "Joystick Left\r\n";
else if (JoyStatus_LCL & JOY_RIGHT)
- ReportString = JoystickStrings[3];
+ ReportString = "Joystick Right\r\n";
else if (JoyStatus_LCL & JOY_PRESS)
- ReportString = JoystickStrings[4];
+ ReportString = "Joystick Pressed\r\n";
+ else
+ ActionSent = false;
/* Flag management - Only allow one string to be sent per action */
- if (ReportString == NULL)
- {
- ActionSent = false;
- }
- else if ((ActionSent == false) && LineEncoding1.BaudRateBPS)
+ if ((ReportString != NULL) && (ActionSent == false) && LineEncoding1.BaudRateBPS)
{
ActionSent = true;
|