forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

Browse Source
pull/1469/head
Dean Camera 15 years ago
parent c830fcb0e1
commit 33a5715e91
4 changed files with 26 additions and 64 deletions
Show Stats Download Patch File Download Diff File

19
Demos/Device/ClassDriver/CDC/CDC.c
Unescape View File

@ -124,25 +124,16 @@ void CheckJoystickMovement(void)
char* ReportString = NULL;
static bool ActionSent = false;
char* const JoystickStrings[] =
{
"Joystick Up\r\n",
"Joystick Down\r\n",
"Joystick Left\r\n",
"Joystick Right\r\n",
"Joystick Pressed\r\n",
};
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;

19
Demos/Device/ClassDriver/DualCDC/DualCDC.c
Unescape View File

@ -132,25 +132,16 @@ void CheckJoystickMovement(void)
char* ReportString = NULL;
static bool ActionSent = false;
char* const JoystickStrings[] =
{
"Joystick Up\r\n",
"Joystick Down\r\n",
"Joystick Left\r\n",
"Joystick Right\r\n",
"Joystick Pressed\r\n",
};
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;

26
Demos/Device/LowLevel/CDC/CDC.c
Unescape View File

@ -247,14 +247,6 @@ void CDC_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)
@ -285,22 +277,20 @@ void CDC_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) && LineEncoding.BaudRateBPS)
if ((ReportString != NULL) && (ActionSent == false) && LineEncoding.BaudRateBPS)
{
ActionSent = true;

26
Demos/Device/LowLevel/DualCDC/DualCDC.c
Unescape View File

@ -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;

Write Preview
Loading…
Cancel
Save