arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-21 10:26:06 +03:00
Code

Update core_esp8266_si2c.c (#4070)

Browse Source 
* Update core_esp8266_si2c.c

Add 'clockCount' decrement, while-loop, twi_status()

* Update core_esp8266_si2c.c

Indents in changed function, removed superflous else
This commit is contained in:
mrwgx3 2018-03-24 11:49:27 -06:00 committed by Develo
parent 2d39bcba7d
commit 438d3f1d11
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cores/esp8266/core_esp8266_si2c.c
View File

@ -198,17 +198,23 @@ unsigned char twi_readFrom(unsigned char address, unsigned char* buf, unsigned i
return 0; return 0;
} }
uint8_t twi_status(){ uint8_t twi_status() {
if (SCL_READ()==0) return I2C_SCL_HELD_LOW; //SCL held low by another device, no procedure available to recover if (SCL_READ()==0)
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
--clockCount;
twi_read_bit(); twi_read_bit();
if (SCL_READ()==0) return I2C_SCL_HELD_LOW_AFTER_READ; //I2C bus error. SCL held low beyond slave clock stretch time if (SCL_READ()==0)
return I2C_SCL_HELD_LOW_AFTER_READ; //I2C bus error. SCL held low beyond slave clock stretch time
} }
if (SDA_READ()==0) return I2C_SDA_HELD_LOW; //I2C bus error. SDA line held low by slave/another_master after n bits. if (SDA_READ()==0)
return I2C_SDA_HELD_LOW; //I2C bus error. SDA line held low by slave/another_master after n bits.
if(!twi_write_start()) return I2C_SDA_HELD_LOW_AFTER_INIT; //line busy. SDA again held low by another device. 2nd master? if(!twi_write_start())
else return I2C_OK; //all ok return I2C_SDA_HELD_LOW_AFTER_INIT; //line busy. SDA again held low by another device. 2nd master?
}
return I2C_OK; //all ok
}