Don't process keycodes on the slave
This commit is contained in:
parent
f1451b4b04
commit
25285a1c5a
|
@ -126,6 +126,10 @@ void matrix_scan_kb(void) {
|
||||||
matrix_scan_user();
|
matrix_scan_user();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool is_keyboard_master(void) {
|
||||||
|
return is_serial_link_master();
|
||||||
|
}
|
||||||
|
|
||||||
__attribute__ ((weak))
|
__attribute__ ((weak))
|
||||||
void ergodox_board_led_on(void){
|
void ergodox_board_led_on(void){
|
||||||
}
|
}
|
||||||
|
|
|
@ -119,6 +119,11 @@ void keyboard_setup(void) {
|
||||||
matrix_setup();
|
matrix_setup();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
__attribute__((weak))
|
||||||
|
bool is_keyboard_master(void) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
void keyboard_init(void) {
|
void keyboard_init(void) {
|
||||||
timer_init();
|
timer_init();
|
||||||
matrix_init();
|
matrix_init();
|
||||||
|
@ -168,36 +173,38 @@ void keyboard_task(void)
|
||||||
matrix_row_t matrix_change = 0;
|
matrix_row_t matrix_change = 0;
|
||||||
|
|
||||||
matrix_scan();
|
matrix_scan();
|
||||||
for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
|
if (is_keyboard_master()) {
|
||||||
matrix_row = matrix_get_row(r);
|
for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
|
||||||
matrix_change = matrix_row ^ matrix_prev[r];
|
matrix_row = matrix_get_row(r);
|
||||||
if (matrix_change) {
|
matrix_change = matrix_row ^ matrix_prev[r];
|
||||||
|
if (matrix_change) {
|
||||||
#ifdef MATRIX_HAS_GHOST
|
#ifdef MATRIX_HAS_GHOST
|
||||||
if (has_ghost_in_row(r, matrix_row)) {
|
if (has_ghost_in_row(r, matrix_row)) {
|
||||||
/* Keep track of whether ghosted status has changed for
|
/* Keep track of whether ghosted status has changed for
|
||||||
* debugging. But don't update matrix_prev until un-ghosted, or
|
* debugging. But don't update matrix_prev until un-ghosted, or
|
||||||
* the last key would be lost.
|
* the last key would be lost.
|
||||||
*/
|
*/
|
||||||
//if (debug_matrix && matrix_ghost[r] != matrix_row) {
|
//if (debug_matrix && matrix_ghost[r] != matrix_row) {
|
||||||
// matrix_print();
|
// matrix_print();
|
||||||
//}
|
//}
|
||||||
|
//matrix_ghost[r] = matrix_row;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
//matrix_ghost[r] = matrix_row;
|
//matrix_ghost[r] = matrix_row;
|
||||||
continue;
|
|
||||||
}
|
|
||||||
//matrix_ghost[r] = matrix_row;
|
|
||||||
#endif
|
#endif
|
||||||
if (debug_matrix) matrix_print();
|
if (debug_matrix) matrix_print();
|
||||||
for (uint8_t c = 0; c < MATRIX_COLS; c++) {
|
for (uint8_t c = 0; c < MATRIX_COLS; c++) {
|
||||||
if (matrix_change & ((matrix_row_t)1<<c)) {
|
if (matrix_change & ((matrix_row_t)1<<c)) {
|
||||||
action_exec((keyevent_t){
|
action_exec((keyevent_t){
|
||||||
.key = (keypos_t){ .row = r, .col = c },
|
.key = (keypos_t){ .row = r, .col = c },
|
||||||
.pressed = (matrix_row & ((matrix_row_t)1<<c)),
|
.pressed = (matrix_row & ((matrix_row_t)1<<c)),
|
||||||
.time = (timer_read() | 1) /* time should not be 0 */
|
.time = (timer_read() | 1) /* time should not be 0 */
|
||||||
});
|
});
|
||||||
// record a processed key
|
// record a processed key
|
||||||
matrix_prev[r] ^= ((matrix_row_t)1<<c);
|
matrix_prev[r] ^= ((matrix_row_t)1<<c);
|
||||||
// process a key per task call
|
// process a key per task call
|
||||||
goto MATRIX_LOOP_END;
|
goto MATRIX_LOOP_END;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue