forked from mirrors/qmk_firmware
0ae20e7457
* 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>
118 lines
4.8 KiB
C
118 lines
4.8 KiB
C
/* Copyright 2021 QMK
|
|
*
|
|
* 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 <string.h>
|
|
#include <debug.h>
|
|
|
|
#include "transactions.h"
|
|
#include "transport.h"
|
|
#include "transaction_id_define.h"
|
|
#include "atomic_util.h"
|
|
|
|
#ifdef USE_I2C
|
|
|
|
# ifndef SLAVE_I2C_TIMEOUT
|
|
# define SLAVE_I2C_TIMEOUT 100
|
|
# endif // SLAVE_I2C_TIMEOUT
|
|
|
|
# ifndef SLAVE_I2C_ADDRESS
|
|
# define SLAVE_I2C_ADDRESS 0x32
|
|
# endif
|
|
|
|
# include "i2c_master.h"
|
|
# include "i2c_slave.h"
|
|
|
|
// Ensure the I2C buffer has enough space
|
|
_Static_assert(sizeof(split_shared_memory_t) <= I2C_SLAVE_REG_COUNT, "split_shared_memory_t too large for I2C_SLAVE_REG_COUNT");
|
|
|
|
split_shared_memory_t *const split_shmem = (split_shared_memory_t *)i2c_slave_reg;
|
|
|
|
void transport_master_init(void) { i2c_init(); }
|
|
void transport_slave_init(void) { i2c_slave_init(SLAVE_I2C_ADDRESS); }
|
|
|
|
i2c_status_t transport_trigger_callback(int8_t id) {
|
|
// If there's no callback, indicate that we were successful
|
|
if (!split_transaction_table[id].slave_callback) {
|
|
return I2C_STATUS_SUCCESS;
|
|
}
|
|
|
|
// Kick off the "callback executor", now that data has been written to the slave
|
|
split_shmem->transaction_id = id;
|
|
split_transaction_desc_t *trans = &split_transaction_table[I2C_EXECUTE_CALLBACK];
|
|
return i2c_writeReg(SLAVE_I2C_ADDRESS, trans->initiator2target_offset, split_trans_initiator2target_buffer(trans), trans->initiator2target_buffer_size, SLAVE_I2C_TIMEOUT);
|
|
}
|
|
|
|
bool transport_execute_transaction(int8_t id, const void *initiator2target_buf, uint16_t initiator2target_length, void *target2initiator_buf, uint16_t target2initiator_length) {
|
|
i2c_status_t status;
|
|
split_transaction_desc_t *trans = &split_transaction_table[id];
|
|
if (initiator2target_length > 0) {
|
|
size_t len = trans->initiator2target_buffer_size < initiator2target_length ? trans->initiator2target_buffer_size : initiator2target_length;
|
|
memcpy(split_trans_initiator2target_buffer(trans), initiator2target_buf, len);
|
|
if ((status = i2c_writeReg(SLAVE_I2C_ADDRESS, trans->initiator2target_offset, split_trans_initiator2target_buffer(trans), len, SLAVE_I2C_TIMEOUT)) < 0) {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
// If we need to execute a callback on the slave, do so
|
|
if ((status = transport_trigger_callback(id)) < 0) {
|
|
return false;
|
|
}
|
|
|
|
if (target2initiator_length > 0) {
|
|
size_t len = trans->target2initiator_buffer_size < target2initiator_length ? trans->target2initiator_buffer_size : target2initiator_length;
|
|
if ((status = i2c_readReg(SLAVE_I2C_ADDRESS, trans->target2initiator_offset, split_trans_target2initiator_buffer(trans), len, SLAVE_I2C_TIMEOUT)) < 0) {
|
|
return false;
|
|
}
|
|
memcpy(target2initiator_buf, split_trans_target2initiator_buffer(trans), len);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
#else // USE_I2C
|
|
|
|
# include "serial.h"
|
|
|
|
static split_shared_memory_t shared_memory;
|
|
split_shared_memory_t *const split_shmem = &shared_memory;
|
|
|
|
void transport_master_init(void) { soft_serial_initiator_init(); }
|
|
void transport_slave_init(void) { soft_serial_target_init(); }
|
|
|
|
bool transport_execute_transaction(int8_t id, const void *initiator2target_buf, uint16_t initiator2target_length, void *target2initiator_buf, uint16_t target2initiator_length) {
|
|
split_transaction_desc_t *trans = &split_transaction_table[id];
|
|
if (initiator2target_length > 0) {
|
|
size_t len = trans->initiator2target_buffer_size < initiator2target_length ? trans->initiator2target_buffer_size : initiator2target_length;
|
|
memcpy(split_trans_initiator2target_buffer(trans), initiator2target_buf, len);
|
|
}
|
|
|
|
if (soft_serial_transaction(id) != TRANSACTION_END) {
|
|
return false;
|
|
}
|
|
|
|
if (target2initiator_length > 0) {
|
|
size_t len = trans->target2initiator_buffer_size < target2initiator_length ? trans->target2initiator_buffer_size : target2initiator_length;
|
|
memcpy(target2initiator_buf, split_trans_target2initiator_buffer(trans), len);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
#endif // USE_I2C
|
|
|
|
bool transport_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) { return transactions_master(master_matrix, slave_matrix); }
|
|
|
|
void transport_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) { transactions_slave(master_matrix, slave_matrix); }
|