uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix and use KeyMatrix_Scan()

Browse Source
This commit is contained in:
László Monda
2016-10-11 21:56:24 +02:00
parent 7d3abdffef
commit 2dd260e84b
2 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shared/key_matrix.c
View File

@@ -22,12 +22,12 @@ void KeyMatrix_Init(key_matrix_t *keyMatrix)
void KeyMatrix_Scan(key_matrix_t *keyMatrix)
{
uint8_t keyId = 0;
for (uint8_t col=0; col<keyMatrix->colNum; col++) {
GPIO_WritePinOutput(keyMatrix->cols[col].gpio, keyMatrix->cols[col].pin, 1);
for (uint8_t row=0; row<keyMatrix->rowNum; row++) {
keyMatrix->keyStates[keyId++] = GPIO_ReadPinInput(keyMatrix->rows[row].gpio, keyMatrix->rows[row].pin);
keyMatrix->keyStates[row*keyMatrix->colNum + col] = GPIO_ReadPinInput(keyMatrix->rows[row].gpio, keyMatrix->rows[row].pin);
}
GPIO_WritePinOutput(keyMatrix->cols[col].gpio, keyMatrix->cols[col].pin, 0);
for (volatile uint32_t i=0; i<100; i++); // Wait for the new port state to settle. This avoid bogus key state detection.
}
}