diff options
Diffstat (limited to 'keyboards/ergodox_ez/matrix.c')
| -rw-r--r-- | keyboards/ergodox_ez/matrix.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c index 8b117166f..d8b708a16 100644 --- a/keyboards/ergodox_ez/matrix.c +++ b/keyboards/ergodox_ez/matrix.c | |||
| @@ -295,13 +295,13 @@ static matrix_row_t read_cols(uint8_t row) | |||
| 295 | return 0; | 295 | return 0; |
| 296 | } else { | 296 | } else { |
| 297 | uint8_t data = 0; | 297 | uint8_t data = 0; |
| 298 | mcp23018_status = i2c_start(I2C_ADDR_WRITE); if (mcp23018_status) goto out; | 298 | mcp23018_status = i2c_start(I2C_ADDR_WRITE, 0); if (mcp23018_status) goto out; |
| 299 | mcp23018_status = i2c_write(GPIOB); if (mcp23018_status) goto out; | 299 | mcp23018_status = i2c_write(GPIOB, 0); if (mcp23018_status) goto out; |
| 300 | mcp23018_status = i2c_start(I2C_ADDR_READ); if (mcp23018_status) goto out; | 300 | mcp23018_status = i2c_start(I2C_ADDR_READ, 0); if (mcp23018_status) goto out; |
| 301 | data = i2c_read_nack(); | 301 | mcp23018_status = i2c_read_nack(0); if (mcp23018_status < 0) goto out; |
| 302 | data = ~data; | 302 | data = ~((uint8_t)mcp23018_status); |
| 303 | out: | 303 | out: |
| 304 | i2c_stop(); | 304 | i2c_stop(0); |
| 305 | return data; | 305 | return data; |
| 306 | } | 306 | } |
| 307 | } else { | 307 | } else { |
| @@ -350,11 +350,11 @@ static void select_row(uint8_t row) | |||
| 350 | } else { | 350 | } else { |
| 351 | // set active row low : 0 | 351 | // set active row low : 0 |
| 352 | // set other rows hi-Z : 1 | 352 | // set other rows hi-Z : 1 |
| 353 | mcp23018_status = i2c_start(I2C_ADDR_WRITE); if (mcp23018_status) goto out; | 353 | mcp23018_status = i2c_start(I2C_ADDR_WRITE, 0); if (mcp23018_status) goto out; |
| 354 | mcp23018_status = i2c_write(GPIOA); if (mcp23018_status) goto out; | 354 | mcp23018_status = i2c_write(GPIOA, 0); if (mcp23018_status) goto out; |
| 355 | mcp23018_status = i2c_write(0xFF & ~(1<<row)); if (mcp23018_status) goto out; | 355 | mcp23018_status = i2c_write(0xFF & ~(1<<row), 0); if (mcp23018_status) goto out; |
| 356 | out: | 356 | out: |
| 357 | i2c_stop(); | 357 | i2c_stop(0); |
| 358 | } | 358 | } |
| 359 | } else { | 359 | } else { |
| 360 | // select on teensy | 360 | // select on teensy |