mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-11-22 03:19:24 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
83a7506438
@ -146,7 +146,7 @@ static matrix_row_t read_cols(uint8_t row) {
|
||||
// reading GPIOB (column port) since in mcp23018's sequential mode
|
||||
// it is addressed directly after writing to GPIOA in select_row()
|
||||
mcp23018_status = i2c_receive(I2C_ADDR, &data, 1, BAJJAK_EZ_I2C_TIMEOUT);
|
||||
return data;
|
||||
return ~data;
|
||||
}
|
||||
} else {
|
||||
/* read from teensy
|
||||
|
@ -255,6 +255,7 @@ static matrix_row_t read_cols(uint8_t row)
|
||||
} else {
|
||||
uint8_t data = 0;
|
||||
mcp23018_status = i2c_read_register(I2C_ADDR, GPIOB, &data, 1, ERGODOX_EZ_I2C_TIMEOUT);
|
||||
data = ~data;
|
||||
|
||||
#ifdef DEBUG_MATRIX
|
||||
if (data != 0x00) xprintf("I2C: %d\n", data);
|
||||
|
Loading…
Reference in New Issue
Block a user