2015-08-21 22:46:53 +08:00
|
|
|
/*
|
2018-09-29 00:33:11 +08:00
|
|
|
Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
|
2015-08-21 22:46:53 +08:00
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <stdbool.h>
|
2021-06-09 15:19:42 +08:00
|
|
|
#include <string.h>
|
2015-08-21 22:46:53 +08:00
|
|
|
#include "util.h"
|
|
|
|
#include "matrix.h"
|
2019-01-18 02:08:14 +08:00
|
|
|
#include "debounce.h"
|
2018-09-29 00:33:11 +08:00
|
|
|
#include "quantum.h"
|
2021-07-12 05:31:35 +08:00
|
|
|
#ifdef SPLIT_KEYBOARD
|
|
|
|
# include "split_common/split_util.h"
|
|
|
|
# include "split_common/transactions.h"
|
|
|
|
|
|
|
|
# define ROWS_PER_HAND (MATRIX_ROWS / 2)
|
|
|
|
#else
|
|
|
|
# define ROWS_PER_HAND (MATRIX_ROWS)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef DIRECT_PINS_RIGHT
|
|
|
|
# define SPLIT_MUTABLE
|
|
|
|
#else
|
|
|
|
# define SPLIT_MUTABLE const
|
|
|
|
#endif
|
|
|
|
#ifdef MATRIX_ROW_PINS_RIGHT
|
|
|
|
# define SPLIT_MUTABLE_ROW
|
|
|
|
#else
|
|
|
|
# define SPLIT_MUTABLE_ROW const
|
|
|
|
#endif
|
|
|
|
#ifdef MATRIX_COL_PINS_RIGHT
|
|
|
|
# define SPLIT_MUTABLE_COL
|
|
|
|
#else
|
|
|
|
# define SPLIT_MUTABLE_COL const
|
|
|
|
#endif
|
2016-10-30 05:12:58 +08:00
|
|
|
|
2019-04-12 02:51:55 +08:00
|
|
|
#ifdef DIRECT_PINS
|
2021-07-12 05:31:35 +08:00
|
|
|
static SPLIT_MUTABLE pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
|
2019-04-12 02:51:55 +08:00
|
|
|
#elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
|
2021-06-09 15:19:42 +08:00
|
|
|
# ifdef MATRIX_ROW_PINS
|
2021-07-12 05:31:35 +08:00
|
|
|
static SPLIT_MUTABLE_ROW pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
|
2021-06-09 15:19:42 +08:00
|
|
|
# endif // MATRIX_ROW_PINS
|
|
|
|
# ifdef MATRIX_COL_PINS
|
2021-07-12 05:31:35 +08:00
|
|
|
static SPLIT_MUTABLE_COL pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
|
2021-06-09 15:19:42 +08:00
|
|
|
# endif // MATRIX_COL_PINS
|
2017-02-06 08:42:00 +08:00
|
|
|
#endif
|
2016-07-04 23:45:58 +08:00
|
|
|
|
|
|
|
/* matrix state(1:on, 0:off) */
|
2020-01-15 09:58:32 +08:00
|
|
|
extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
|
|
|
|
extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values
|
2016-07-04 23:45:58 +08:00
|
|
|
|
2021-07-12 05:31:35 +08:00
|
|
|
#ifdef SPLIT_KEYBOARD
|
|
|
|
// row offsets for each hand
|
|
|
|
uint8_t thisHand, thatHand;
|
|
|
|
#endif
|
|
|
|
|
2021-06-09 15:19:42 +08:00
|
|
|
// user-defined overridable functions
|
|
|
|
__attribute__((weak)) void matrix_init_pins(void);
|
|
|
|
__attribute__((weak)) void matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row);
|
2021-10-27 11:01:57 +08:00
|
|
|
__attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter);
|
2021-07-12 05:31:35 +08:00
|
|
|
#ifdef SPLIT_KEYBOARD
|
|
|
|
__attribute__((weak)) void matrix_slave_scan_kb(void) { matrix_slave_scan_user(); }
|
|
|
|
__attribute__((weak)) void matrix_slave_scan_user(void) {}
|
|
|
|
#endif
|
2021-06-09 15:19:42 +08:00
|
|
|
|
2020-11-29 04:02:18 +08:00
|
|
|
static inline void setPinOutput_writeLow(pin_t pin) {
|
|
|
|
ATOMIC_BLOCK_FORCEON {
|
|
|
|
setPinOutput(pin);
|
|
|
|
writePinLow(pin);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-02-09 12:50:13 +08:00
|
|
|
static inline void setPinOutput_writeHigh(pin_t pin) {
|
|
|
|
ATOMIC_BLOCK_FORCEON {
|
|
|
|
setPinOutput(pin);
|
|
|
|
writePinHigh(pin);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-11-29 04:02:18 +08:00
|
|
|
static inline void setPinInputHigh_atomic(pin_t pin) {
|
2020-12-17 22:06:30 +08:00
|
|
|
ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); }
|
2020-11-29 04:02:18 +08:00
|
|
|
}
|
|
|
|
|
2021-07-03 15:20:11 +08:00
|
|
|
static inline uint8_t readMatrixPin(pin_t pin) {
|
|
|
|
if (pin != NO_PIN) {
|
|
|
|
return readPin(pin);
|
|
|
|
} else {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-05 04:29:44 +08:00
|
|
|
// matrix code
|
2015-09-14 10:10:01 +08:00
|
|
|
|
2019-04-12 02:51:55 +08:00
|
|
|
#ifdef DIRECT_PINS
|
|
|
|
|
2021-06-01 13:10:39 +08:00
|
|
|
__attribute__((weak)) void matrix_init_pins(void) {
|
2019-08-31 02:19:03 +08:00
|
|
|
for (int row = 0; row < MATRIX_ROWS; row++) {
|
|
|
|
for (int col = 0; col < MATRIX_COLS; col++) {
|
|
|
|
pin_t pin = direct_pins[row][col];
|
|
|
|
if (pin != NO_PIN) {
|
|
|
|
setPinInputHigh(pin);
|
|
|
|
}
|
|
|
|
}
|
2019-04-12 02:51:55 +08:00
|
|
|
}
|
|
|
|
}
|
2016-10-29 03:21:38 +08:00
|
|
|
|
2021-06-09 15:19:42 +08:00
|
|
|
__attribute__((weak)) void matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
|
2020-05-22 00:59:56 +08:00
|
|
|
// Start with a clear matrix row
|
|
|
|
matrix_row_t current_row_value = 0;
|
2016-10-29 03:21:38 +08:00
|
|
|
|
2021-10-27 11:01:57 +08:00
|
|
|
matrix_row_t row_shifter = MATRIX_ROW_SHIFTER;
|
|
|
|
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++, row_shifter <<= 1) {
|
2019-08-31 02:19:03 +08:00
|
|
|
pin_t pin = direct_pins[current_row][col_index];
|
|
|
|
if (pin != NO_PIN) {
|
2021-10-27 11:01:57 +08:00
|
|
|
current_row_value |= readPin(pin) ? 0 : row_shifter;
|
2019-08-31 02:19:03 +08:00
|
|
|
}
|
2019-04-12 02:51:55 +08:00
|
|
|
}
|
|
|
|
|
2021-06-09 15:19:42 +08:00
|
|
|
// Update the matrix
|
|
|
|
current_matrix[current_row] = current_row_value;
|
2019-04-12 02:51:55 +08:00
|
|
|
}
|
|
|
|
|
2020-01-19 11:11:57 +08:00
|
|
|
#elif defined(DIODE_DIRECTION)
|
2021-06-09 15:19:42 +08:00
|
|
|
# if defined(MATRIX_ROW_PINS) && defined(MATRIX_COL_PINS)
|
|
|
|
# if (DIODE_DIRECTION == COL2ROW)
|
2019-04-12 02:51:55 +08:00
|
|
|
|
2021-07-03 15:20:11 +08:00
|
|
|
static bool select_row(uint8_t row) {
|
|
|
|
pin_t pin = row_pins[row];
|
|
|
|
if (pin != NO_PIN) {
|
|
|
|
setPinOutput_writeLow(pin);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
2019-04-12 02:51:55 +08:00
|
|
|
|
2021-07-03 15:20:11 +08:00
|
|
|
static void unselect_row(uint8_t row) {
|
|
|
|
pin_t pin = row_pins[row];
|
|
|
|
if (pin != NO_PIN) {
|
2022-02-09 12:50:13 +08:00
|
|
|
# ifdef MATRIX_UNSELECT_DRIVE_HIGH
|
|
|
|
setPinOutput_writeHigh(pin);
|
|
|
|
# else
|
2021-07-03 15:20:11 +08:00
|
|
|
setPinInputHigh_atomic(pin);
|
2022-02-09 12:50:13 +08:00
|
|
|
# endif
|
2021-07-03 15:20:11 +08:00
|
|
|
}
|
|
|
|
}
|
2019-04-12 02:51:55 +08:00
|
|
|
|
2019-08-31 02:19:03 +08:00
|
|
|
static void unselect_rows(void) {
|
2021-07-12 23:43:05 +08:00
|
|
|
for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
|
2021-07-03 15:20:11 +08:00
|
|
|
unselect_row(x);
|
2016-07-04 23:45:58 +08:00
|
|
|
}
|
2015-08-21 22:46:53 +08:00
|
|
|
}
|
|
|
|
|
2021-06-01 13:10:39 +08:00
|
|
|
__attribute__((weak)) void matrix_init_pins(void) {
|
2019-08-31 02:19:03 +08:00
|
|
|
unselect_rows();
|
|
|
|
for (uint8_t x = 0; x < MATRIX_COLS; x++) {
|
2021-07-03 15:20:11 +08:00
|
|
|
if (col_pins[x] != NO_PIN) {
|
|
|
|
setPinInputHigh_atomic(col_pins[x]);
|
|
|
|
}
|
2019-08-31 02:19:03 +08:00
|
|
|
}
|
2019-04-12 02:51:55 +08:00
|
|
|
}
|
|
|
|
|
2021-06-09 15:19:42 +08:00
|
|
|
__attribute__((weak)) void matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
|
2020-05-22 00:59:56 +08:00
|
|
|
// Start with a clear matrix row
|
|
|
|
matrix_row_t current_row_value = 0;
|
2015-09-14 10:10:01 +08:00
|
|
|
|
2021-07-03 15:20:11 +08:00
|
|
|
if (!select_row(current_row)) { // Select row
|
|
|
|
return; // skip NO_PIN row
|
|
|
|
}
|
2021-01-13 09:46:22 +08:00
|
|
|
matrix_output_select_delay();
|
2016-10-29 03:21:38 +08:00
|
|
|
|
2016-10-29 05:24:20 +08:00
|
|
|
// For each col...
|
2021-10-27 11:01:57 +08:00
|
|
|
matrix_row_t row_shifter = MATRIX_ROW_SHIFTER;
|
|
|
|
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++, row_shifter <<= 1) {
|
2021-07-03 15:20:11 +08:00
|
|
|
uint8_t pin_state = readMatrixPin(col_pins[col_index]);
|
2016-10-29 05:24:20 +08:00
|
|
|
|
|
|
|
// Populate the matrix row with the state of the col pin
|
2021-10-27 11:01:57 +08:00
|
|
|
current_row_value |= pin_state ? 0 : row_shifter;
|
2016-10-29 05:24:20 +08:00
|
|
|
}
|
2016-10-29 23:39:03 +08:00
|
|
|
|
|
|
|
// Unselect row
|
|
|
|
unselect_row(current_row);
|
2021-07-13 15:50:25 +08:00
|
|
|
matrix_output_unselect_delay(current_row, current_row_value != 0); // wait for all Col signals to go HIGH
|
2016-10-30 05:12:58 +08:00
|
|
|
|
2021-06-09 15:19:42 +08:00
|
|
|
// Update the matrix
|
|
|
|
current_matrix[current_row] = current_row_value;
|
2015-08-21 22:46:53 +08:00
|
|
|
}
|
|
|
|
|
2021-06-09 15:19:42 +08:00
|
|
|
# elif (DIODE_DIRECTION == ROW2COL)
|
2019-04-12 02:51:55 +08:00
|
|
|
|
2021-07-03 15:20:11 +08:00
|
|
|
static bool select_col(uint8_t col) {
|
|
|
|
pin_t pin = col_pins[col];
|
|
|
|
if (pin != NO_PIN) {
|
|
|
|
setPinOutput_writeLow(pin);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
2016-10-29 03:21:38 +08:00
|
|
|
|
2021-07-03 15:20:11 +08:00
|
|
|
static void unselect_col(uint8_t col) {
|
|
|
|
pin_t pin = col_pins[col];
|
|
|
|
if (pin != NO_PIN) {
|
2022-02-09 12:50:13 +08:00
|
|
|
# ifdef MATRIX_UNSELECT_DRIVE_HIGH
|
|
|
|
setPinOutput_writeHigh(pin);
|
|
|
|
# else
|
2021-07-03 15:20:11 +08:00
|
|
|
setPinInputHigh_atomic(pin);
|
2022-02-09 12:50:13 +08:00
|
|
|
# endif
|
2021-07-03 15:20:11 +08:00
|
|
|
}
|
|
|
|
}
|
2016-10-29 03:21:38 +08:00
|
|
|
|
2019-08-31 02:19:03 +08:00
|
|
|
static void unselect_cols(void) {
|
|
|
|
for (uint8_t x = 0; x < MATRIX_COLS; x++) {
|
2021-07-03 15:20:11 +08:00
|
|
|
unselect_col(x);
|
2016-05-24 11:42:21 +08:00
|
|
|
}
|
2016-07-04 23:45:58 +08:00
|
|
|
}
|
|
|
|
|
2021-06-01 13:10:39 +08:00
|
|
|
__attribute__((weak)) void matrix_init_pins(void) {
|
2019-08-31 02:19:03 +08:00
|
|
|
unselect_cols();
|
2021-07-12 23:43:05 +08:00
|
|
|
for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
|
2021-07-03 15:20:11 +08:00
|
|
|
if (row_pins[x] != NO_PIN) {
|
|
|
|
setPinInputHigh_atomic(row_pins[x]);
|
|
|
|
}
|
2019-08-31 02:19:03 +08:00
|
|
|
}
|
2016-10-29 03:21:38 +08:00
|
|
|
}
|
2016-07-04 23:45:58 +08:00
|
|
|
|
2021-10-27 11:01:57 +08:00
|
|
|
__attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter) {
|
2021-07-13 15:50:25 +08:00
|
|
|
bool key_pressed = false;
|
|
|
|
|
2021-01-13 09:46:22 +08:00
|
|
|
// Select col
|
2021-07-03 15:20:11 +08:00
|
|
|
if (!select_col(current_col)) { // select col
|
|
|
|
return; // skip NO_PIN col
|
|
|
|
}
|
2021-01-13 09:46:22 +08:00
|
|
|
matrix_output_select_delay();
|
2016-10-29 03:21:38 +08:00
|
|
|
|
2016-10-29 05:24:20 +08:00
|
|
|
// For each row...
|
2021-07-12 05:31:35 +08:00
|
|
|
for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) {
|
2016-10-29 23:39:03 +08:00
|
|
|
// Check row pin state
|
2021-07-03 15:20:11 +08:00
|
|
|
if (readMatrixPin(row_pins[row_index]) == 0) {
|
2016-10-29 23:39:03 +08:00
|
|
|
// Pin LO, set col bit
|
2021-10-27 11:01:57 +08:00
|
|
|
current_matrix[row_index] |= row_shifter;
|
2021-07-13 15:50:25 +08:00
|
|
|
key_pressed = true;
|
2019-08-31 02:19:03 +08:00
|
|
|
} else {
|
2016-10-29 23:39:03 +08:00
|
|
|
// Pin HI, clear col bit
|
2021-10-27 11:01:57 +08:00
|
|
|
current_matrix[row_index] &= ~row_shifter;
|
2016-10-30 05:12:58 +08:00
|
|
|
}
|
2016-10-29 05:24:20 +08:00
|
|
|
}
|
2016-10-29 23:39:03 +08:00
|
|
|
|
|
|
|
// Unselect col
|
|
|
|
unselect_col(current_col);
|
2021-07-13 15:50:25 +08:00
|
|
|
matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH
|
2016-10-29 03:21:38 +08:00
|
|
|
}
|
|
|
|
|
2021-06-09 15:19:42 +08:00
|
|
|
# else
|
|
|
|
# error DIODE_DIRECTION must be one of COL2ROW or ROW2COL!
|
|
|
|
# endif
|
|
|
|
# endif // defined(MATRIX_ROW_PINS) && defined(MATRIX_COL_PINS)
|
2020-01-19 11:11:57 +08:00
|
|
|
#else
|
|
|
|
# error DIODE_DIRECTION is not defined!
|
2019-04-12 02:51:55 +08:00
|
|
|
#endif
|
2016-10-29 03:21:38 +08:00
|
|
|
|
2019-04-12 02:51:55 +08:00
|
|
|
void matrix_init(void) {
|
2021-07-12 05:31:35 +08:00
|
|
|
#ifdef SPLIT_KEYBOARD
|
|
|
|
split_pre_init();
|
|
|
|
|
|
|
|
// Set pinout for right half if pinout for that half is defined
|
|
|
|
if (!isLeftHand) {
|
|
|
|
# ifdef DIRECT_PINS_RIGHT
|
|
|
|
const pin_t direct_pins_right[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS_RIGHT;
|
|
|
|
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
|
|
|
for (uint8_t j = 0; j < MATRIX_COLS; j++) {
|
|
|
|
direct_pins[i][j] = direct_pins_right[i][j];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
# ifdef MATRIX_ROW_PINS_RIGHT
|
|
|
|
const pin_t row_pins_right[MATRIX_ROWS] = MATRIX_ROW_PINS_RIGHT;
|
|
|
|
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
|
|
|
row_pins[i] = row_pins_right[i];
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
# ifdef MATRIX_COL_PINS_RIGHT
|
|
|
|
const pin_t col_pins_right[MATRIX_COLS] = MATRIX_COL_PINS_RIGHT;
|
|
|
|
for (uint8_t i = 0; i < MATRIX_COLS; i++) {
|
|
|
|
col_pins[i] = col_pins_right[i];
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
}
|
|
|
|
|
|
|
|
thisHand = isLeftHand ? 0 : (ROWS_PER_HAND);
|
|
|
|
thatHand = ROWS_PER_HAND - thisHand;
|
|
|
|
#endif
|
|
|
|
|
2019-04-12 02:51:55 +08:00
|
|
|
// initialize key pins
|
2021-06-01 13:10:39 +08:00
|
|
|
matrix_init_pins();
|
2019-04-12 02:51:55 +08:00
|
|
|
|
|
|
|
// initialize matrix state: all keys off
|
2021-09-18 15:29:22 +08:00
|
|
|
memset(matrix, 0, sizeof(matrix));
|
|
|
|
memset(raw_matrix, 0, sizeof(raw_matrix));
|
2019-04-12 02:51:55 +08:00
|
|
|
|
2021-07-12 05:31:35 +08:00
|
|
|
debounce_init(ROWS_PER_HAND);
|
2019-04-12 02:51:55 +08:00
|
|
|
|
|
|
|
matrix_init_quantum();
|
2021-07-12 05:31:35 +08:00
|
|
|
|
|
|
|
#ifdef SPLIT_KEYBOARD
|
|
|
|
split_post_init();
|
|
|
|
#endif
|
2016-10-29 03:21:38 +08:00
|
|
|
}
|
|
|
|
|
2021-07-12 05:31:35 +08:00
|
|
|
#ifdef SPLIT_KEYBOARD
|
Make solo half of split keyboards (more) usable. (#13523)
* Make solo half of split keyboards (more) usable.
Using only one half of a split keyboard (that's using the split_common
framework to communicate) is not a great experience, since several read
timeouts per scan cycle cause an unusably slow scan rate.
This change blocks all split communication attempts for 500 ms
(configurable) after an error occurs, causing the scan rate to become at
least _more_ usable, but might need some tweaking to work fully on most
keyboards. One read timeout still needs to occur after the 500 ms has
passed, and if that timeout isn't low enough, some scan cycles may still
be too slow.
* Fix lint complaint.
* Require 25 consecutive comm errors to see comms as disconnected.
The number of max errors can be overridden by defining
`SPLIT_MAX_CONNECTION_ERRORS`.
* Add comments to new defines, and ability to disable disconnection check.
Also increase `SPLIT_MAX_CONNECTION_ERRORS` to 40, since it's divisible
by most relevant numbers for the description.
* Make lint happy ...again
* Only update `connection_check_timer` when needed.
* Add new defines to split keyboard documentation.
* Move connection timeout logic to transport.c, add `is_transport_connected`.
* Use split_common disconnection logic in matrix.c.
Instead of doing more or less the same thing twice.
* Move disconnection logic to `transport_master`.
Is a cleaner implementation, and causes the scan rate while disconnected
to increase instead of decrease.
* Lint fixes.
* Lower default `SERIAL_USART_TIMEOUT` to 20 ms.
The read timeout must be low enough to not cause exessively long scan
cycles when using a solo split half. 10 ms was determined from testing
to work fine even with the slowest defined baudrate of 19200 (5 ms was
too low for that case), so 20 ms should be fine for most cases.
* Remove `SERIAL_USART_TIMEOUT` from ergodox_infinity/config.h
Was somewhat mistakenly included in an earlier PR.
* Fix building with `USE_I2C`.
* Reduce built firmware size.
Not really sure why this works, the idea was taken from tzarc's work on
split disconnection.
* Tweak and improve opt-out for split disconnection logic.
There are now two ways to opt out from this feature:
* Set `SPLIT_MAX_CONNECTION_ERRORS` to 0. This will completely disable
the connection status checks (also affects the slave matrix reset logic in
matrix.c, though).
* Set `SPLIT_CONNECTION_CHECK_TIMEOUT` to 0. This will only disable the
communication throttling while disconnected. Will make the firmware
smaller.
* Make split disconnection logic work with custom transports.
Includes a fallback implementation for keyboards using a custom
split_util.c but not a custom matrix.c (currently no such keyboard seems
to be merged, though).
* Remove unnecessary include of timer.h
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2021-08-22 08:51:17 +08:00
|
|
|
// Fallback implementation for keyboards not using the standard split_util.c
|
|
|
|
__attribute__((weak)) bool transport_master_if_connected(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
|
|
|
|
transport_master(master_matrix, slave_matrix);
|
|
|
|
return true; // Treat the transport as always connected
|
|
|
|
}
|
|
|
|
|
2021-07-12 05:31:35 +08:00
|
|
|
bool matrix_post_scan(void) {
|
|
|
|
bool changed = false;
|
|
|
|
if (is_keyboard_master()) {
|
2021-09-18 15:29:22 +08:00
|
|
|
static bool last_connected = false;
|
2021-07-12 05:31:35 +08:00
|
|
|
matrix_row_t slave_matrix[ROWS_PER_HAND] = {0};
|
Make solo half of split keyboards (more) usable. (#13523)
* Make solo half of split keyboards (more) usable.
Using only one half of a split keyboard (that's using the split_common
framework to communicate) is not a great experience, since several read
timeouts per scan cycle cause an unusably slow scan rate.
This change blocks all split communication attempts for 500 ms
(configurable) after an error occurs, causing the scan rate to become at
least _more_ usable, but might need some tweaking to work fully on most
keyboards. One read timeout still needs to occur after the 500 ms has
passed, and if that timeout isn't low enough, some scan cycles may still
be too slow.
* Fix lint complaint.
* Require 25 consecutive comm errors to see comms as disconnected.
The number of max errors can be overridden by defining
`SPLIT_MAX_CONNECTION_ERRORS`.
* Add comments to new defines, and ability to disable disconnection check.
Also increase `SPLIT_MAX_CONNECTION_ERRORS` to 40, since it's divisible
by most relevant numbers for the description.
* Make lint happy ...again
* Only update `connection_check_timer` when needed.
* Add new defines to split keyboard documentation.
* Move connection timeout logic to transport.c, add `is_transport_connected`.
* Use split_common disconnection logic in matrix.c.
Instead of doing more or less the same thing twice.
* Move disconnection logic to `transport_master`.
Is a cleaner implementation, and causes the scan rate while disconnected
to increase instead of decrease.
* Lint fixes.
* Lower default `SERIAL_USART_TIMEOUT` to 20 ms.
The read timeout must be low enough to not cause exessively long scan
cycles when using a solo split half. 10 ms was determined from testing
to work fine even with the slowest defined baudrate of 19200 (5 ms was
too low for that case), so 20 ms should be fine for most cases.
* Remove `SERIAL_USART_TIMEOUT` from ergodox_infinity/config.h
Was somewhat mistakenly included in an earlier PR.
* Fix building with `USE_I2C`.
* Reduce built firmware size.
Not really sure why this works, the idea was taken from tzarc's work on
split disconnection.
* Tweak and improve opt-out for split disconnection logic.
There are now two ways to opt out from this feature:
* Set `SPLIT_MAX_CONNECTION_ERRORS` to 0. This will completely disable
the connection status checks (also affects the slave matrix reset logic in
matrix.c, though).
* Set `SPLIT_CONNECTION_CHECK_TIMEOUT` to 0. This will only disable the
communication throttling while disconnected. Will make the firmware
smaller.
* Make split disconnection logic work with custom transports.
Includes a fallback implementation for keyboards using a custom
split_util.c but not a custom matrix.c (currently no such keyboard seems
to be merged, though).
* Remove unnecessary include of timer.h
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2021-08-22 08:51:17 +08:00
|
|
|
if (transport_master_if_connected(matrix + thisHand, slave_matrix)) {
|
2021-09-18 15:29:22 +08:00
|
|
|
changed = memcmp(matrix + thatHand, slave_matrix, sizeof(slave_matrix)) != 0;
|
Make solo half of split keyboards (more) usable. (#13523)
* Make solo half of split keyboards (more) usable.
Using only one half of a split keyboard (that's using the split_common
framework to communicate) is not a great experience, since several read
timeouts per scan cycle cause an unusably slow scan rate.
This change blocks all split communication attempts for 500 ms
(configurable) after an error occurs, causing the scan rate to become at
least _more_ usable, but might need some tweaking to work fully on most
keyboards. One read timeout still needs to occur after the 500 ms has
passed, and if that timeout isn't low enough, some scan cycles may still
be too slow.
* Fix lint complaint.
* Require 25 consecutive comm errors to see comms as disconnected.
The number of max errors can be overridden by defining
`SPLIT_MAX_CONNECTION_ERRORS`.
* Add comments to new defines, and ability to disable disconnection check.
Also increase `SPLIT_MAX_CONNECTION_ERRORS` to 40, since it's divisible
by most relevant numbers for the description.
* Make lint happy ...again
* Only update `connection_check_timer` when needed.
* Add new defines to split keyboard documentation.
* Move connection timeout logic to transport.c, add `is_transport_connected`.
* Use split_common disconnection logic in matrix.c.
Instead of doing more or less the same thing twice.
* Move disconnection logic to `transport_master`.
Is a cleaner implementation, and causes the scan rate while disconnected
to increase instead of decrease.
* Lint fixes.
* Lower default `SERIAL_USART_TIMEOUT` to 20 ms.
The read timeout must be low enough to not cause exessively long scan
cycles when using a solo split half. 10 ms was determined from testing
to work fine even with the slowest defined baudrate of 19200 (5 ms was
too low for that case), so 20 ms should be fine for most cases.
* Remove `SERIAL_USART_TIMEOUT` from ergodox_infinity/config.h
Was somewhat mistakenly included in an earlier PR.
* Fix building with `USE_I2C`.
* Reduce built firmware size.
Not really sure why this works, the idea was taken from tzarc's work on
split disconnection.
* Tweak and improve opt-out for split disconnection logic.
There are now two ways to opt out from this feature:
* Set `SPLIT_MAX_CONNECTION_ERRORS` to 0. This will completely disable
the connection status checks (also affects the slave matrix reset logic in
matrix.c, though).
* Set `SPLIT_CONNECTION_CHECK_TIMEOUT` to 0. This will only disable the
communication throttling while disconnected. Will make the firmware
smaller.
* Make split disconnection logic work with custom transports.
Includes a fallback implementation for keyboards using a custom
split_util.c but not a custom matrix.c (currently no such keyboard seems
to be merged, though).
* Remove unnecessary include of timer.h
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2021-08-22 08:51:17 +08:00
|
|
|
|
2021-09-18 15:29:22 +08:00
|
|
|
last_connected = true;
|
|
|
|
} else if (last_connected) {
|
|
|
|
// reset other half when disconnected
|
|
|
|
memset(slave_matrix, 0, sizeof(slave_matrix));
|
Make solo half of split keyboards (more) usable. (#13523)
* Make solo half of split keyboards (more) usable.
Using only one half of a split keyboard (that's using the split_common
framework to communicate) is not a great experience, since several read
timeouts per scan cycle cause an unusably slow scan rate.
This change blocks all split communication attempts for 500 ms
(configurable) after an error occurs, causing the scan rate to become at
least _more_ usable, but might need some tweaking to work fully on most
keyboards. One read timeout still needs to occur after the 500 ms has
passed, and if that timeout isn't low enough, some scan cycles may still
be too slow.
* Fix lint complaint.
* Require 25 consecutive comm errors to see comms as disconnected.
The number of max errors can be overridden by defining
`SPLIT_MAX_CONNECTION_ERRORS`.
* Add comments to new defines, and ability to disable disconnection check.
Also increase `SPLIT_MAX_CONNECTION_ERRORS` to 40, since it's divisible
by most relevant numbers for the description.
* Make lint happy ...again
* Only update `connection_check_timer` when needed.
* Add new defines to split keyboard documentation.
* Move connection timeout logic to transport.c, add `is_transport_connected`.
* Use split_common disconnection logic in matrix.c.
Instead of doing more or less the same thing twice.
* Move disconnection logic to `transport_master`.
Is a cleaner implementation, and causes the scan rate while disconnected
to increase instead of decrease.
* Lint fixes.
* Lower default `SERIAL_USART_TIMEOUT` to 20 ms.
The read timeout must be low enough to not cause exessively long scan
cycles when using a solo split half. 10 ms was determined from testing
to work fine even with the slowest defined baudrate of 19200 (5 ms was
too low for that case), so 20 ms should be fine for most cases.
* Remove `SERIAL_USART_TIMEOUT` from ergodox_infinity/config.h
Was somewhat mistakenly included in an earlier PR.
* Fix building with `USE_I2C`.
* Reduce built firmware size.
Not really sure why this works, the idea was taken from tzarc's work on
split disconnection.
* Tweak and improve opt-out for split disconnection logic.
There are now two ways to opt out from this feature:
* Set `SPLIT_MAX_CONNECTION_ERRORS` to 0. This will completely disable
the connection status checks (also affects the slave matrix reset logic in
matrix.c, though).
* Set `SPLIT_CONNECTION_CHECK_TIMEOUT` to 0. This will only disable the
communication throttling while disconnected. Will make the firmware
smaller.
* Make split disconnection logic work with custom transports.
Includes a fallback implementation for keyboards using a custom
split_util.c but not a custom matrix.c (currently no such keyboard seems
to be merged, though).
* Remove unnecessary include of timer.h
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2021-08-22 08:51:17 +08:00
|
|
|
changed = true;
|
2021-09-18 15:29:22 +08:00
|
|
|
|
|
|
|
last_connected = false;
|
2021-07-12 05:31:35 +08:00
|
|
|
}
|
|
|
|
|
2021-09-18 15:29:22 +08:00
|
|
|
if (changed) memcpy(matrix + thatHand, slave_matrix, sizeof(slave_matrix));
|
|
|
|
|
2021-07-12 05:31:35 +08:00
|
|
|
matrix_scan_quantum();
|
|
|
|
} else {
|
|
|
|
transport_slave(matrix + thatHand, matrix + thisHand);
|
|
|
|
|
|
|
|
matrix_slave_scan_kb();
|
|
|
|
}
|
|
|
|
|
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2019-08-31 02:19:03 +08:00
|
|
|
uint8_t matrix_scan(void) {
|
2021-06-09 15:19:42 +08:00
|
|
|
matrix_row_t curr_matrix[MATRIX_ROWS] = {0};
|
2019-04-12 02:51:55 +08:00
|
|
|
|
|
|
|
#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
|
2019-08-31 02:19:03 +08:00
|
|
|
// Set row, read cols
|
2021-07-12 05:31:35 +08:00
|
|
|
for (uint8_t current_row = 0; current_row < ROWS_PER_HAND; current_row++) {
|
2021-06-09 15:19:42 +08:00
|
|
|
matrix_read_cols_on_row(curr_matrix, current_row);
|
2019-08-31 02:19:03 +08:00
|
|
|
}
|
2019-04-12 02:51:55 +08:00
|
|
|
#elif (DIODE_DIRECTION == ROW2COL)
|
2019-08-31 02:19:03 +08:00
|
|
|
// Set col, read rows
|
2021-10-27 11:01:57 +08:00
|
|
|
matrix_row_t row_shifter = MATRIX_ROW_SHIFTER;
|
|
|
|
for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++, row_shifter <<= 1) {
|
|
|
|
matrix_read_rows_on_col(curr_matrix, current_col, row_shifter);
|
2019-08-31 02:19:03 +08:00
|
|
|
}
|
2016-10-29 03:21:38 +08:00
|
|
|
#endif
|
2019-04-12 02:51:55 +08:00
|
|
|
|
2021-06-09 15:19:42 +08:00
|
|
|
bool changed = memcmp(raw_matrix, curr_matrix, sizeof(curr_matrix)) != 0;
|
|
|
|
if (changed) memcpy(raw_matrix, curr_matrix, sizeof(curr_matrix));
|
|
|
|
|
2021-07-12 05:31:35 +08:00
|
|
|
#ifdef SPLIT_KEYBOARD
|
|
|
|
debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed);
|
|
|
|
changed = (changed || matrix_post_scan());
|
|
|
|
#else
|
|
|
|
debounce(raw_matrix, matrix, ROWS_PER_HAND, changed);
|
2019-08-31 02:19:03 +08:00
|
|
|
matrix_scan_quantum();
|
2021-07-12 05:31:35 +08:00
|
|
|
#endif
|
2019-08-31 02:19:03 +08:00
|
|
|
return (uint8_t)changed;
|
2019-04-12 02:51:55 +08:00
|
|
|
}
|