|
|
@ -24,8 +24,6 @@ |
|
|
|
#include "print.h" |
|
|
|
#include "print.h" |
|
|
|
#include "modelm.h" |
|
|
|
#include "modelm.h" |
|
|
|
|
|
|
|
|
|
|
|
#define DEBUG 0 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#define SPI_TIMEOUT 100 |
|
|
|
#define SPI_TIMEOUT 100 |
|
|
|
|
|
|
|
|
|
|
|
/* Keyboard Matrix Assignments */ |
|
|
|
/* Keyboard Matrix Assignments */ |
|
|
@ -62,10 +60,9 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) |
|
|
|
row_data = spi_read() << 8; |
|
|
|
row_data = spi_read() << 8; |
|
|
|
row_data |= spi_read(); |
|
|
|
row_data |= spi_read(); |
|
|
|
|
|
|
|
|
|
|
|
#if DEBUG |
|
|
|
debug_hex8(~row_data); |
|
|
|
print_hex8(~row_data); |
|
|
|
dprint(" "); |
|
|
|
uprint(" "); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
// For each row...
|
|
|
|
// For each row...
|
|
|
|
for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { |
|
|
|
for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { |
|
|
|
// Store last value of row prior to reading
|
|
|
|
// Store last value of row prior to reading
|
|
|
@ -105,9 +102,8 @@ void matrix_init_custom(void) { |
|
|
|
bool matrix_scan_custom(matrix_row_t current_matrix[]) { |
|
|
|
bool matrix_scan_custom(matrix_row_t current_matrix[]) { |
|
|
|
bool changed = false; |
|
|
|
bool changed = false; |
|
|
|
|
|
|
|
|
|
|
|
#if DEBUG |
|
|
|
dprint("\r\nScan: "); |
|
|
|
uprint("\r\nScan: "); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
// Set col, read rows
|
|
|
|
// Set col, read rows
|
|
|
|
for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) { |
|
|
|
for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) { |
|
|
|
changed |= read_rows_on_col(current_matrix, current_col); |
|
|
|
changed |= read_rows_on_col(current_matrix, current_col); |
|
|
|