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

Call KeyMatrix_ScanRow() from an LPTMR interrupt for the left half. Remove KeyMatrix_Scan()

Browse Source
This commit is contained in:
László Monda
2017-11-14 02:29:18 +01:00
parent ae4d60882f
commit 5c84620704
5 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
shared/key_matrix.c
View File

@@ -18,26 +18,6 @@ void KeyMatrix_Init(key_matrix_t *keyMatrix)
}
}
void KeyMatrix_Scan(key_matrix_t *keyMatrix)
{
uint8_t *keyState = keyMatrix->keyStates;
key_matrix_pin_t *rowEnd = keyMatrix->rows + keyMatrix->rowNum;
for (key_matrix_pin_t *row = keyMatrix->rows; row<rowEnd; row++) {
GPIO_Type *rowGpio = row->gpio;
uint32_t rowPin = row->pin;
GPIO_WritePinOutput(rowGpio, rowPin, 1);
key_matrix_pin_t *colEnd = keyMatrix->cols + keyMatrix->colNum;
for (key_matrix_pin_t *col = keyMatrix->cols; col<colEnd; col++) {
*(keyState++) = GPIO_ReadPinInput(col->gpio, col->pin);
}
GPIO_WritePinOutput(rowGpio, rowPin, 0);
for (volatile uint32_t i=0; i<100; i++); // Wait for the new port state to settle. This avoids bogus key state detection.
}
}
void KeyMatrix_ScanRow(key_matrix_t *keyMatrix)
{
uint8_t *keyState = keyMatrix->keyStates + keyMatrix->currentRowNum * keyMatrix->colNum;

1
shared/key_matrix.h
View File

@@ -31,7 +31,6 @@
// Functions:
void KeyMatrix_Init(key_matrix_t *keyMatrix);
void KeyMatrix_Scan(key_matrix_t *keyMatrix);
void KeyMatrix_ScanRow(key_matrix_t *keyMatrix);
#endif