arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-25 20:02:37 +03:00
Code

Add missing decrement operator to I2C clockCount (#5292)

Browse Source
This commit is contained in:
Develo 2018-10-29 16:30:21 -03:00 committed by GitHub
parent 8785143bff
commit 8ae0746e4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cores/esp8266/core_esp8266_si2c.c
View File

@ -293,24 +293,23 @@ unsigned char twi_readFrom(unsigned char address, unsigned char* buf, unsigned i
} }
uint8_t twi_status() { uint8_t twi_status() {
if (SCL_READ()==0) { if (SCL_READ() == 0)
return I2C_SCL_HELD_LOW; // SCL held low by another device, no procedure available to recover return I2C_SCL_HELD_LOW; // SCL held low by another device, no procedure available to recover
}
int clockCount = 20; int clockCount = 20;
while (SDA_READ()==0 && clockCount>0) { // if SDA low, read the bits slaves have to sent to a max while (SDA_READ() == 0 && clockCount-- > 0) { // if SDA low, read the bits slaves have to sent to a max
twi_read_bit(); twi_read_bit();
if (SCL_READ()==0) { if (SCL_READ() == 0) {
return I2C_SCL_HELD_LOW_AFTER_READ; // I2C bus error. SCL held low beyond slave clock stretch time return I2C_SCL_HELD_LOW_AFTER_READ; // I2C bus error. SCL held low beyond slave clock stretch time
} }
} }
if (SDA_READ()==0) { if (SDA_READ() == 0)
return I2C_SDA_HELD_LOW; // I2C bus error. SDA line held low by slave/another_master after n bits. return I2C_SDA_HELD_LOW; // I2C bus error. SDA line held low by slave/another_master after n bits.
}
if (!twi_write_start()) { if (!twi_write_start())
return I2C_SDA_HELD_LOW_AFTER_INIT; // line busy. SDA again held low by another device. 2nd master? return I2C_SDA_HELD_LOW_AFTER_INIT; // line busy. SDA again held low by another device. 2nd master?
} else {
return I2C_OK; return I2C_OK;
}
} }
uint8_t twi_transmit(const uint8_t* data, uint8_t length) uint8_t twi_transmit(const uint8_t* data, uint8_t length)