summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoresinlayo <esinlayo@gmail.com>2020-02-07 18:52:02 -0800
committerFlorian Didron <fdidron@users.noreply.github.com>2020-02-26 10:15:12 +0900
commita714e1e0e3335babd2f20e0723228910b3c1cc29 (patch)
treea6aa368f2d23e91afbe430b1e0b41e8b6c334dfa
parent41194bcbd30034bd26961b0f450bd8e150ca3e89 (diff)
[Keyboard] Remove i2c write command when reading columns on Ergodox EZ (#8092)
* Remove i2c write command when reading cols on Ergodox EZ * Comment on mcp23018 address state during read_cols
-rw-r--r--keyboards/ergodox_ez/matrix.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c
index 6d976f143c..6ce3d7216e 100644
--- a/keyboards/ergodox_ez/matrix.c
+++ b/keyboards/ergodox_ez/matrix.c
@@ -216,10 +216,8 @@ static matrix_row_t read_cols(uint8_t row) {
return 0;
} else {
uint8_t data = 0;
- 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;
+ // reading GPIOB (column port) since in mcp23018's sequential mode
+ // it is addressed directly after writing to GPIOA in select_row()
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);