aboutsummaryrefslogtreecommitdiff
path: root/quantum/matrix.c
diff options
context:
space:
mode:
authorJoakim Tufvegren <jocke@barbanet.com>2021-08-22 02:51:17 +0200
committerGitHub <noreply@github.com>2021-08-22 10:51:17 +1000
commit0ae20e74578ae4420af3e684f7ad9fcbd7beee94 (patch)
treec6e1ae2876f3f27b80858cecb72a53935b91aaf5 /quantum/matrix.c
parentc5f41d42d8e4dc88b2aeb414aa0d26ad23ad34f1 (diff)
downloadqmk_firmware-0ae20e74578ae4420af3e684f7ad9fcbd7beee94.tar.gz
qmk_firmware-0ae20e74578ae4420af3e684f7ad9fcbd7beee94.zip
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>
Diffstat (limited to 'quantum/matrix.c')
-rw-r--r--quantum/matrix.c36
1 files changed, 15 insertions, 21 deletions
diff --git a/quantum/matrix.c b/quantum/matrix.c
index d22817bf4..33586c431 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -25,10 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
25# include "split_common/split_util.h" 25# include "split_common/split_util.h"
26# include "split_common/transactions.h" 26# include "split_common/transactions.h"
27 27
28# ifndef ERROR_DISCONNECT_COUNT
29# define ERROR_DISCONNECT_COUNT 5
30# endif // ERROR_DISCONNECT_COUNT
31
32# define ROWS_PER_HAND (MATRIX_ROWS / 2) 28# define ROWS_PER_HAND (MATRIX_ROWS / 2)
33#else 29#else
34# define ROWS_PER_HAND (MATRIX_ROWS) 30# define ROWS_PER_HAND (MATRIX_ROWS)
@@ -307,33 +303,31 @@ void matrix_init(void) {
307} 303}
308 304
309#ifdef SPLIT_KEYBOARD 305#ifdef SPLIT_KEYBOARD
306// Fallback implementation for keyboards not using the standard split_util.c
307__attribute__((weak)) bool transport_master_if_connected(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
308 transport_master(master_matrix, slave_matrix);
309 return true; // Treat the transport as always connected
310}
311
310bool matrix_post_scan(void) { 312bool matrix_post_scan(void) {
311 bool changed = false; 313 bool changed = false;
312 if (is_keyboard_master()) { 314 if (is_keyboard_master()) {
313 static uint8_t error_count;
314
315 matrix_row_t slave_matrix[ROWS_PER_HAND] = {0}; 315 matrix_row_t slave_matrix[ROWS_PER_HAND] = {0};
316 if (!transport_master(matrix + thisHand, slave_matrix)) { 316 if (transport_master_if_connected(matrix + thisHand, slave_matrix)) {
317 error_count++;
318
319 if (error_count > ERROR_DISCONNECT_COUNT) {
320 // reset other half if disconnected
321 for (int i = 0; i < ROWS_PER_HAND; ++i) {
322 matrix[thatHand + i] = 0;
323 slave_matrix[i] = 0;
324 }
325
326 changed = true;
327 }
328 } else {
329 error_count = 0;
330
331 for (int i = 0; i < ROWS_PER_HAND; ++i) { 317 for (int i = 0; i < ROWS_PER_HAND; ++i) {
332 if (matrix[thatHand + i] != slave_matrix[i]) { 318 if (matrix[thatHand + i] != slave_matrix[i]) {
333 matrix[thatHand + i] = slave_matrix[i]; 319 matrix[thatHand + i] = slave_matrix[i];
334 changed = true; 320 changed = true;
335 } 321 }
336 } 322 }
323 } else {
324 // reset other half if disconnected
325 for (int i = 0; i < ROWS_PER_HAND; ++i) {
326 matrix[thatHand + i] = 0;
327 slave_matrix[i] = 0;
328 }
329
330 changed = true;
337 } 331 }
338 332
339 matrix_scan_quantum(); 333 matrix_scan_quantum();