gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 21:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

ducky: refactor matrix.c again so we can better compare it to other boards

Browse Source
This commit is contained in:
Reza Jelveh 2020-12-07 18:47:50 +08:00
parent 26a04a6db5
commit e96587eebc
1 changed files with 38 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
keyboards/ducky/one2mini/matrix.c
View File

@ -69,52 +69,20 @@ static void unselect_col(uint8_t col);
static void select_col(uint8_t col); static void select_col(uint8_t col);
#endif #endif
__attribute__((weak)) void matrix_init_quantum(void) { matrix_init_kb(); } __attribute__((weak)) void matrix_init_user(void) {}
__attribute__((weak)) void matrix_scan_quantum(void) { matrix_scan_kb(); } __attribute__((weak)) void matrix_scan_user(void) {}
__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); } __attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); } __attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
__attribute__((weak)) void matrix_init_user(void) {}
__attribute__((weak)) void matrix_scan_user(void) {}
inline uint8_t matrix_rows(void) { return MATRIX_ROWS; } inline uint8_t matrix_rows(void) { return MATRIX_ROWS; }
inline uint8_t matrix_cols(void) { return MATRIX_COLS; } inline uint8_t matrix_cols(void) { return MATRIX_COLS; }
__attribute__((weak)) bool peek_matrix(uint8_t row_index, uint8_t col_index, bool raw) { return 0 != ((raw ? raw_matrix[row_index] : matrix[row_index]) & (MATRIX_ROW_SHIFTER << col_index)); } __attribute__((weak)) bool peek_matrix(uint8_t row_index, uint8_t col_index, bool raw) { return 0 != ((raw ? raw_matrix[row_index] : matrix[row_index]) & (MATRIX_ROW_SHIFTER << col_index)); }
void matrix_init(void) {
unselect_rows();
init_cols();
// initialize matrix state: all keys off
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
raw_matrix[i] = 0;
matrix[i] = 0;
}
debounce_init(MATRIX_ROWS);
matrix_init_quantum();
}
uint8_t matrix_scan(void) {
bool changed = false;
// Set row, read cols
for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
changed |= read_cols_on_row(raw_matrix, current_row);
}
debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
matrix_scan_quantum();
return (uint8_t)changed;
}
inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); } inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }
inline matrix_row_t matrix_get_row(uint8_t row) { inline matrix_row_t matrix_get_row(uint8_t row) {
@ -146,6 +114,17 @@ uint8_t matrix_key_count(void) {
return count; return count;
} }
static void select_row(uint8_t row) {
setPinOutput(row_pins[row]);
writePinLow(row_pins[row]);
}
static void unselect_row(uint8_t row) { writePinHigh(row_pins[row]); }
static void unselect_rows(void) {
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
writePinHigh(row_pins[x]);
}
}
static void init_cols(void) { static void init_cols(void) {
for (uint8_t x = 0; x < MATRIX_COLS; x++) { for (uint8_t x = 0; x < MATRIX_COLS; x++) {
setPinInputHigh(col_pins[x]); setPinInputHigh(col_pins[x]);
@ -178,15 +157,31 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
return (last_row_value != current_matrix[current_row]); return (last_row_value != current_matrix[current_row]);
} }
static void select_row(uint8_t row) { void matrix_init(void) {
setPinOutput(row_pins[row]); unselect_rows();
writePinLow(row_pins[row]); init_cols();
}
static void unselect_row(uint8_t row) { writePinHigh(row_pins[row]); } // initialize matrix state: all keys off
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
static void unselect_rows(void) { raw_matrix[i] = 0;
for (uint8_t x = 0; x < MATRIX_ROWS; x++) { matrix[i] = 0;
writePinHigh(row_pins[x]);
} }
debounce_init(MATRIX_ROWS);
matrix_init_quantum();
}
uint8_t matrix_scan(void) {
bool changed = false;
// Set row, read cols
for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
changed |= read_cols_on_row(raw_matrix, current_row);
}
debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
matrix_scan_quantum();
return (uint8_t)changed;
} }