melissa/zsa_qmk_firmware
1
0
Fork 0
mirror of https://github.com/zsa/qmk_firmware.git synced 2026-01-08 22:52:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix i2c timeouts (#401)

Browse Source 
* MCP23018: make timeout configurable

* Fix i2c timeouts for all boards
This commit is contained in:
Drashna Jaelre
2024-08-28 16:21:48 -07:00
committed by GitHub
parent 0be58d4b06
commit 35a93f3ce5
6 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpio/mcp23018.c
View File

@@ -7,7 +7,9 @@
#include "debug.h" #include "debug.h"
#define SLAVE_TO_ADDR(n) (n << 1) #define SLAVE_TO_ADDR(n) (n << 1)
#define TIMEOUT 100 #ifndef MCP23018_TIMEOUT
# define MCP23018_TIMEOUT 100
#endif // MCP23018_TIMEOUT
enum { enum {
CMD_IODIRA = 0x00, // i/o direction register CMD_IODIRA = 0x00, // i/o direction register
@@ -33,13 +35,13 @@ bool mcp23018_set_config(uint8_t slave_addr, mcp23018_port_t port, uint8_t conf)
uint8_t cmdDirection = port ? CMD_IODIRB : CMD_IODIRA; uint8_t cmdDirection = port ? CMD_IODIRB : CMD_IODIRA;
uint8_t cmdPullup = port ? CMD_GPPUB : CMD_GPPUA; uint8_t cmdPullup = port ? CMD_GPPUB : CMD_GPPUA;
i2c_status_t ret = i2c_write_register(addr, cmdDirection, &conf, sizeof(conf), TIMEOUT); i2c_status_t ret = i2c_write_register(addr, cmdDirection, &conf, sizeof(conf), MCP23018_TIMEOUT);
if (ret != I2C_STATUS_SUCCESS) { if (ret != I2C_STATUS_SUCCESS) {
dprintf("mcp23018_set_config::directionFAILED::%u\n", ret); dprintf("mcp23018_set_config::directionFAILED::%u\n", ret);
return false; return false;
} }
ret = i2c_write_register(addr, cmdPullup, &conf, sizeof(conf), TIMEOUT); ret = i2c_write_register(addr, cmdPullup, &conf, sizeof(conf), MCP23018_TIMEOUT);
if (ret != I2C_STATUS_SUCCESS) { if (ret != I2C_STATUS_SUCCESS) {
dprintf("mcp23018_set_config::pullupFAILED::%u\n", ret); dprintf("mcp23018_set_config::pullupFAILED::%u\n", ret);
return false; return false;
@@ -52,7 +54,7 @@ bool mcp23018_set_output(uint8_t slave_addr, mcp23018_port_t port, uint8_t conf)
uint8_t addr = SLAVE_TO_ADDR(slave_addr); uint8_t addr = SLAVE_TO_ADDR(slave_addr);
uint8_t cmd = port ? CMD_GPIOB : CMD_GPIOA; uint8_t cmd = port ? CMD_GPIOB : CMD_GPIOA;
i2c_status_t ret = i2c_write_register(addr, cmd, &conf, sizeof(conf), TIMEOUT); i2c_status_t ret = i2c_write_register(addr, cmd, &conf, sizeof(conf), MCP23018_TIMEOUT);
if (ret != I2C_STATUS_SUCCESS) { if (ret != I2C_STATUS_SUCCESS) {
dprintf("mcp23018_set_output::FAILED::%u\n", ret); dprintf("mcp23018_set_output::FAILED::%u\n", ret);
return false; return false;
@@ -65,7 +67,7 @@ bool mcp23018_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB) {
uint8_t addr = SLAVE_TO_ADDR(slave_addr); uint8_t addr = SLAVE_TO_ADDR(slave_addr);
uint8_t conf[2] = {confA, confB}; uint8_t conf[2] = {confA, confB};
i2c_status_t ret = i2c_write_register(addr, CMD_GPIOA, &conf[0], sizeof(conf), TIMEOUT); i2c_status_t ret = i2c_write_register(addr, CMD_GPIOA, &conf[0], sizeof(conf), MCP23018_TIMEOUT);
if (ret != I2C_STATUS_SUCCESS) { if (ret != I2C_STATUS_SUCCESS) {
dprintf("mcp23018_set_output::FAILED::%u\n", ret); dprintf("mcp23018_set_output::FAILED::%u\n", ret);
return false; return false;
@@ -78,7 +80,7 @@ bool mcp23018_read_pins(uint8_t slave_addr, mcp23018_port_t port, uint8_t* out)
uint8_t addr = SLAVE_TO_ADDR(slave_addr); uint8_t addr = SLAVE_TO_ADDR(slave_addr);
uint8_t cmd = port ? CMD_GPIOB : CMD_GPIOA; uint8_t cmd = port ? CMD_GPIOB : CMD_GPIOA;
i2c_status_t ret = i2c_read_register(addr, cmd, out, sizeof(uint8_t), TIMEOUT); i2c_status_t ret = i2c_read_register(addr, cmd, out, sizeof(uint8_t), MCP23018_TIMEOUT);
if (ret != I2C_STATUS_SUCCESS) { if (ret != I2C_STATUS_SUCCESS) {
dprintf("mcp23018_read_pins::FAILED::%u\n", ret); dprintf("mcp23018_read_pins::FAILED::%u\n", ret);
return false; return false;
@@ -97,7 +99,7 @@ bool mcp23018_read_pins_all(uint8_t slave_addr, uint16_t* out) {
data16 data = {.u16 = 0}; data16 data = {.u16 = 0};
i2c_status_t ret = i2c_read_register(addr, CMD_GPIOA, &data.u8[0], sizeof(data), TIMEOUT); i2c_status_t ret = i2c_read_register(addr, CMD_GPIOA, &data.u8[0], sizeof(data), MCP23018_TIMEOUT);
if (ret != I2C_STATUS_SUCCESS) { if (ret != I2C_STATUS_SUCCESS) {
dprintf("mcp23018_read_pins_all::FAILED::%u\n", ret); dprintf("mcp23018_read_pins_all::FAILED::%u\n", ret);
return false; return false;

2
keyboards/zsa/ergodox_ez/ergodox_ez.h
View File

@@ -31,7 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
extern i2c_status_t mcp23018_status; extern i2c_status_t mcp23018_status;
#ifndef ERGODOX_EZ_I2C_TIMEOUT #ifndef ERGODOX_EZ_I2C_TIMEOUT
# define ERGODOX_EZ_I2C_TIMEOUT 80 # define ERGODOX_EZ_I2C_TIMEOUT 10
#endif #endif
#ifndef MCP23018_EXPANDER_I2C_ADDR #ifndef MCP23018_EXPANDER_I2C_ADDR
# define MCP23018_EXPANDER_I2C_ADDR (0x20 << 1) # define MCP23018_EXPANDER_I2C_ADDR (0x20 << 1)

4
keyboards/zsa/ergodox_ez/post_config.h
View File

@@ -40,6 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif #endif
#define WS2812_LED_COUNT RGBLIGHT_LED_COUNT #define WS2812_LED_COUNT RGBLIGHT_LED_COUNT
#ifndef ISSI_TIMEOUT #ifndef IS31FL3731_I2C_TIMEOUT
# define ISSI_TIMEOUT 3 # define IS31FL3731_I2C_TIMEOUT 3
#endif #endif

3
keyboards/zsa/moonlander/config.h
View File

@@ -22,6 +22,9 @@
#define MATRIX_ROWS 12 #define MATRIX_ROWS 12
#define MATRIX_COLS 7 #define MATRIX_COLS 7
#define MCP23018_TIMEOUT 10
#define EEPROM_I2C_24LC128 #define EEPROM_I2C_24LC128
#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND

1
keyboards/zsa/planck_ez/config.h
View File

@@ -24,3 +24,4 @@
#define AUDIO_PIN_ALT_AS_NEGATIVE #define AUDIO_PIN_ALT_AS_NEGATIVE
#define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND #define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
#define IS31FL3737_I2C_TIMEOUT 5

2
keyboards/zsa/voyager/config.h
View File

@@ -7,6 +7,8 @@
#define MATRIX_COLS 7 #define MATRIX_COLS 7
#define MATRIX_ROWS 12 #define MATRIX_ROWS 12
#define MCP23018_TIMEOUT 10
#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC