Skip to content

Commit

Permalink
Revert "Keep track of last matrix activity (qmk#10730)"
Browse files Browse the repository at this point in the history
This reverts commit 3d6315d.
  • Loading branch information
tzarc committed Jan 14, 2021
1 parent f336004 commit 669cd4b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 30 deletions.
29 changes: 9 additions & 20 deletions quantum/split_common/matrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -251,59 +251,48 @@ void matrix_init(void) {
split_post_init();
}

bool matrix_post_scan(void) {
bool changed = false;
void matrix_post_scan(void) {
if (is_keyboard_master()) {
static uint8_t error_count;

matrix_row_t slave_matrix[ROWS_PER_HAND] = {0};
if (!transport_master(slave_matrix)) {
if (!transport_master(matrix + thatHand)) {
error_count++;

if (error_count > ERROR_DISCONNECT_COUNT) {
// reset other half if disconnected
for (int i = 0; i < ROWS_PER_HAND; ++i) {
slave_matrix[i] = 0;
matrix[thatHand + i] = 0;
}
}
} else {
error_count = 0;
}

for (int i = 0; i < ROWS_PER_HAND; ++i) {
if (matrix[thatHand + i] != slave_matrix[i]) {
matrix[thatHand + i] = slave_matrix[i];
changed = true;
}
}

matrix_scan_quantum();
} else {
transport_slave(matrix + thisHand);

matrix_slave_scan_user();
}

return changed;
}

uint8_t matrix_scan(void) {
bool local_changed = false;
bool changed = false;

#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
// Set row, read cols
for (uint8_t current_row = 0; current_row < ROWS_PER_HAND; current_row++) {
local_changed |= read_cols_on_row(raw_matrix, current_row);
changed |= read_cols_on_row(raw_matrix, current_row);
}
#elif (DIODE_DIRECTION == ROW2COL)
// Set col, read rows
for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
local_changed |= read_rows_on_col(raw_matrix, current_col);
changed |= read_rows_on_col(raw_matrix, current_col);
}
#endif

debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, local_changed);
debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed);

bool remote_changed = matrix_post_scan();
return (uint8_t)(local_changed || remote_changed);
matrix_post_scan();
return (uint8_t)changed;
}
13 changes: 6 additions & 7 deletions tmk_core/common/keyboard.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# include "dip_switch.h"
#endif

static uint32_t last_matrix_modification_time = 0;
uint32_t last_matrix_activity_time(void) { return last_matrix_modification_time; }
uint32_t last_matrix_activity_elapsed(void) { return timer_elapsed32(last_matrix_modification_time); }

// Only enable this if console is enabled to print to
#if defined(DEBUG_MATRIX_SCAN_RATE) && defined(CONSOLE_ENABLE)
static uint32_t matrix_timer = 0;
Expand Down Expand Up @@ -342,8 +338,11 @@ void keyboard_task(void) {
housekeeping_task_kb();
housekeeping_task_user();

uint8_t matrix_changed = matrix_scan();
if (matrix_changed) last_matrix_modification_time = timer_read32();
#if defined(OLED_DRIVER_ENABLE) && !defined(OLED_DISABLE_TIMEOUT)
uint8_t ret = matrix_scan();
#else
matrix_scan();
#endif

if (should_process_keypress()) {
for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
Expand Down Expand Up @@ -410,7 +409,7 @@ void keyboard_task(void) {
oled_task();
# ifndef OLED_DISABLE_TIMEOUT
// Wake up oled if user is using those fabulous keys!
if (matrix_changed) oled_on();
if (ret) oled_on();
# endif
#endif

Expand Down
3 changes: 0 additions & 3 deletions tmk_core/common/keyboard.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ void keyboard_post_init_user(void);
void housekeeping_task_kb(void);
void housekeeping_task_user(void);

uint32_t last_matrix_activity_time(void); // Timestamp of the last matrix activity
uint32_t last_matrix_activity_elapsed(void); // Number of milliseconds since the last matrix activity

#ifdef __cplusplus
}
#endif

0 comments on commit 669cd4b

Please sign in to comment.