diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2018-06-23 20:18:47 +0200 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-06-23 20:18:47 +0200 |
| commit | 7a44ad83fce391c938d18abcc2125e15c1982078 (patch) | |
| tree | 1c0db8fbaf33aa1cf408ba418cdb3705b526d618 /keyboards/ergodox_ez/matrix.c | |
| parent | 6380f8319057d33bb6d07c66789867e49c634504 (diff) | |
| download | qmk_firmware-7a44ad83fce391c938d18abcc2125e15c1982078.tar.gz qmk_firmware-7a44ad83fce391c938d18abcc2125e15c1982078.tar.xz | |
adds immediate i2c return, fixes ez matrix code
Diffstat (limited to 'keyboards/ergodox_ez/matrix.c')
| -rw-r--r-- | keyboards/ergodox_ez/matrix.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c index d8b708a16..2e95c83b6 100644 --- a/keyboards/ergodox_ez/matrix.c +++ b/keyboards/ergodox_ez/matrix.c @@ -295,13 +295,14 @@ static matrix_row_t read_cols(uint8_t row) return 0; } else { uint8_t data = 0; - mcp23018_status = i2c_start(I2C_ADDR_WRITE, 0); if (mcp23018_status) goto out; - mcp23018_status = i2c_write(GPIOB, 0); if (mcp23018_status) goto out; - mcp23018_status = i2c_start(I2C_ADDR_READ, 0); if (mcp23018_status) goto out; - mcp23018_status = i2c_read_nack(0); if (mcp23018_status < 0) goto out; + mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out; + mcp23018_status = i2c_write(GPIOB, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out; + mcp23018_status = i2c_start(I2C_ADDR_READ, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out; + mcp23018_status = i2c_read_nack(ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status < 0) goto out; data = ~((uint8_t)mcp23018_status); + mcp23018_status = I2C_STATUS_SUCCESS; out: - i2c_stop(0); + i2c_stop(ERGODOX_EZ_I2C_TIMEOUT); return data; } } else { @@ -350,11 +351,11 @@ static void select_row(uint8_t row) } else { // set active row low : 0 // set other rows hi-Z : 1 - mcp23018_status = i2c_start(I2C_ADDR_WRITE, 0); if (mcp23018_status) goto out; - mcp23018_status = i2c_write(GPIOA, 0); if (mcp23018_status) goto out; - mcp23018_status = i2c_write(0xFF & ~(1<<row), 0); if (mcp23018_status) goto out; + mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out; + mcp23018_status = i2c_write(GPIOA, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out; + mcp23018_status = i2c_write(0xFF & ~(1<<row), ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out; out: - i2c_stop(0); + i2c_stop(ERGODOX_EZ_I2C_TIMEOUT); } } else { // select on teensy |