diff options
| author | QMK Bot <hello@qmk.fm> | 2021-02-28 06:12:24 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-02-28 06:12:24 +0000 |
| commit | fcf1ec132f2d764e9fe13ee689182f490f574415 (patch) | |
| tree | f691b12f77a1b3dd6f45d56517e99a894384929c /keyboards/spiderisland/split78/matrix.c | |
| parent | 4a31d0a9c93ce9334cf915d6f109e5942f282fa7 (diff) | |
| parent | ce75f48acb3ba622201a0615bccb5825d118a703 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/spiderisland/split78/matrix.c')
| -rw-r--r-- | keyboards/spiderisland/split78/matrix.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/keyboards/spiderisland/split78/matrix.c b/keyboards/spiderisland/split78/matrix.c index b5c7028fdf..71e154e5b7 100644 --- a/keyboards/spiderisland/split78/matrix.c +++ b/keyboards/spiderisland/split78/matrix.c @@ -105,9 +105,17 @@ void matrix_init_custom(void) { } +static i2c_status_t mcp23018_status = I2C_STATUS_SUCCESS; + bool matrix_scan_custom(matrix_row_t current_matrix[]) { bool matrix_has_changed = false; +#if defined(RIGHT_HALF) + if (mcp23018_status != I2C_STATUS_SUCCESS) { + mcp23018_status = mcp23018_init(); + } +#endif + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { // Store last value of row prior to reading matrix_row_t last_row_value = current_matrix[row]; @@ -124,7 +132,9 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { // as 0x75 would be no keys pressed uint8_t data = 0x7F; // Receive the columns from right half - i2c_receive(TWI_ADDR_WRITE, &data, 1, I2C_TIMEOUT); + if (mcp23018_status == I2C_STATUS_SUCCESS) { + mcp23018_status = i2c_receive(TWI_ADDR_WRITE, &data, 1, I2C_TIMEOUT); + } #endif cols |= ((~(PINA | 0x80)) & 0x7F); @@ -146,7 +156,9 @@ void matrix_set_row_status(uint8_t row) { //Set the remote row on port A txdata[0] = (GPIOA); txdata[1] = ( 0xFF & ~(1<<row) ); - i2c_transmit(TWI_ADDR_WRITE, (uint8_t *)txdata, 2, I2C_TIMEOUT); + if (mcp23018_status == I2C_STATUS_SUCCESS) { + mcp23018_status = i2c_transmit(TWI_ADDR_WRITE, (uint8_t *)txdata, 2, I2C_TIMEOUT); + } #endif //Set the local row on port B |