private/hsb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed keypad test

Browse Source 
git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@249 05563f52-14a8-4384-a975-3d1654cca0fa
This commit is contained in:
swo
2017-10-11 10:04:39 +00:00
parent 129f76f19b
commit 3df93a80d7
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/src/hwValidationMenu.c
View File

@@ -1111,7 +1111,7 @@ static void hwValidationMenuSM(struct HwValidationMenu* self, Button_Pressed_t b
char data[CMD_BUFFER_SIZE] = {0}; char data[CMD_BUFFER_SIZE] = {0};
size_t actualLength; size_t actualLength;
char buffer[sizeof(struct KeypadQueueItem) / sizeof(char)]; char buffer[sizeof(struct KeypadQueueItem) / sizeof(char)] = {0};
ErrorStatus returnValueKeypad = SUCCESS; ErrorStatus returnValueKeypad = SUCCESS;
outputBufferLength = sprintf(self->outputBuffer, "Keypad test started. Press Esc to stop this test.\r\n"); outputBufferLength = sprintf(self->outputBuffer, "Keypad test started. Press Esc to stop this test.\r\n");
@@ -1132,7 +1132,7 @@ static void hwValidationMenuSM(struct HwValidationMenu* self, Button_Pressed_t b
break; break;
} }
returnValueKeypad = IODevice_read(&self->testItems->keypad->device, buffer, sizeof(struct KeypadQueueItem) / sizeof(char), &actualLength); returnValueKeypad = IODevice_read((struct IODevice *)self->testItems->keypad, buffer, sizeof(struct KeypadQueueItem) / sizeof(char), &actualLength);
if (returnValueKeypad == SUCCESS) if (returnValueKeypad == SUCCESS)
{ {
@@ -1141,16 +1141,17 @@ static void hwValidationMenuSM(struct HwValidationMenu* self, Button_Pressed_t b
keyState = rxQueueItem->keyEvent; keyState = rxQueueItem->keyEvent;
if(keyState == RELEASED){ if(keyState == RELEASED){
outputBufferLength = sprintf(self->outputBuffer, "KEYPAD: Pressed %d-%d\r\n", rxQueueItem->rowCoordinate, rxQueueItem->columnCoordinate);
} else {
outputBufferLength = sprintf(self->outputBuffer, "KEYPAD: Released %d-%d\r\n", rxQueueItem->rowCoordinate, rxQueueItem->columnCoordinate); outputBufferLength = sprintf(self->outputBuffer, "KEYPAD: Released %d-%d\r\n", rxQueueItem->rowCoordinate, rxQueueItem->columnCoordinate);
} else {
outputBufferLength = sprintf(self->outputBuffer, "KEYPAD: Pressed %d-%d\r\n", rxQueueItem->rowCoordinate, rxQueueItem->columnCoordinate);
} }
IODevice_write(self->ioDevice, self->outputBuffer, outputBufferLength);
} }
else else
{ {
outputBufferLength = sprintf(self->outputBuffer, "KEYPAD: Read error\r\n"); //outputBufferLength = sprintf(self->outputBuffer, "KEYPAD: Read error\r\n");
} }
vTaskDelay(10);
} }