diff options
| author | Alex Ong <the.onga@gmail.com> | 2019-01-04 19:43:45 +1100 |
|---|---|---|
| committer | Alex Ong <the.onga@gmail.com> | 2019-01-04 19:43:45 +1100 |
| commit | 2bb2977c133646c4e056960e72029270d77cc1eb (patch) | |
| tree | 235d491f992121ac1716c5bf2fafb80983748576 /quantum/split_common/i2c.c | |
| parent | a55c838961c89097ab849ed6cb1f261791e6b9b4 (diff) | |
| parent | 47c91fc7f75ae0a477e55b687aa0fc30da0a283c (diff) | |
| download | qmk_firmware-2bb2977c133646c4e056960e72029270d77cc1eb.tar.gz qmk_firmware-2bb2977c133646c4e056960e72029270d77cc1eb.zip | |
Merge branch 'master' into debounce_refactor
# Conflicts:
# tmk_core/common/keyboard.c
Diffstat (limited to 'quantum/split_common/i2c.c')
| -rw-r--r-- | quantum/split_common/i2c.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/quantum/split_common/i2c.c b/quantum/split_common/i2c.c index b3d7fcc68..45e958b39 100644 --- a/quantum/split_common/i2c.c +++ b/quantum/split_common/i2c.c | |||
| @@ -7,8 +7,6 @@ | |||
| 7 | #include "i2c.h" | 7 | #include "i2c.h" |
| 8 | #include "split_flags.h" | 8 | #include "split_flags.h" |
| 9 | 9 | ||
| 10 | #if defined(USE_I2C) || defined(EH) | ||
| 11 | |||
| 12 | // Limits the amount of we wait for any one i2c transaction. | 10 | // Limits the amount of we wait for any one i2c transaction. |
| 13 | // Since were running SCL line 100kHz (=> 10μs/bit), and each transactions is | 11 | // Since were running SCL line 100kHz (=> 10μs/bit), and each transactions is |
| 14 | // 9 bits, a single transaction will take around 90μs to complete. | 12 | // 9 bits, a single transaction will take around 90μs to complete. |
| @@ -184,4 +182,3 @@ ISR(TWI_vect) { | |||
| 184 | // Reset everything, so we are ready for the next TWI interrupt | 182 | // Reset everything, so we are ready for the next TWI interrupt |
| 185 | TWCR |= (1<<TWIE) | (1<<TWINT) | (ack<<TWEA) | (1<<TWEN); | 183 | TWCR |= (1<<TWIE) | (1<<TWINT) | (ack<<TWEA) | (1<<TWEN); |
| 186 | } | 184 | } |
| 187 | #endif | ||