glguy/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix a ghosting issue, and introduce longer wait in scanning

Browse Source
This commit is contained in:
Thomas Haukland 2023-05-11 07:14:10 +02:00
parent c6cca1c013
commit 42193e0123
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
keyboards/cheapino/matrix.c
View File

@ -26,6 +26,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "quantum.h" #include "quantum.h"
#include "debounce.h" #include "debounce.h"
#include "encoder.h" #include "encoder.h"
#include "print.h"
// How long the scanning code waits for changed io to settle.
#define MATRIX_IO_DELAY 60
#define COL_SHIFTER ((uint16_t)1) #define COL_SHIFTER ((uint16_t)1)
@ -64,7 +68,7 @@ static void unselect_cols(void) {
static void read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) { static void read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
// Select row and wait for row selection to stabilize // Select row and wait for row selection to stabilize
select_row(current_row); select_row(current_row);
wait_us(30); wait_us(MATRIX_IO_DELAY);
// For each col... // For each col...
for (uint8_t col_index = 0; col_index < MATRIX_COLS / 2; col_index++) { for (uint8_t col_index = 0; col_index < MATRIX_COLS / 2; col_index++) {
@ -86,7 +90,7 @@ static void read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
static void read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { static void read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
// Select col and wait for col selection to stabilize // Select col and wait for col selection to stabilize
select_col(current_col*2); select_col(current_col*2);
wait_us(30); wait_us(MATRIX_IO_DELAY);
uint16_t column_index_bitmask = COL_SHIFTER << (current_col * 2); uint16_t column_index_bitmask = COL_SHIFTER << (current_col * 2);
// For each row... // For each row...
@ -127,6 +131,18 @@ bool has_matrix_changed(matrix_row_t current_matrix[]) {
return false; return false;
} }
// OK, this is nasty, still not sure why its happening, but
// this 3 key combo leads to ghosting of the 4th(the one missing from correct)
static const uint16_t ghost1_row2 = 0B0000010000100000;
static const uint16_t ghost1_row3 = 0B0000100000100000;
static const matrix_row_t ghost1_row3_correct = 0B0000000000010000;
void fix_ghosting_issue(matrix_row_t current_matrix[]) {
if (current_matrix[1] & ghost1_row2 && current_matrix[2] & ghost1_row3) {
current_matrix[2] = ghost1_row3_correct;
}
}
bool matrix_scan_custom(matrix_row_t current_matrix[]) { bool matrix_scan_custom(matrix_row_t current_matrix[]) {
store_old_matrix(current_matrix); store_old_matrix(current_matrix);
// Set row, read cols // Set row, read cols
@ -138,6 +154,8 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
read_rows_on_col(current_matrix, current_col); read_rows_on_col(current_matrix, current_col);
} }
fix_ghosting_issue(current_matrix);
fix_encoder_action(current_matrix); fix_encoder_action(current_matrix);
return has_matrix_changed(current_matrix); return has_matrix_changed(current_matrix);