Skip to content

Add missing decrement operator to I2C clockCount #5292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 29, 2018
Merged

Add missing decrement operator to I2C clockCount #5292

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0807040
Add missing decrement operator to I2C clockCount
devyte Oct 29, 2018
fb341cf
Merge branch 'master' into issue4063
devyte Oct 29, 2018
ab1d0a8
Merge branch 'master' into issue4063
devyte Oct 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions cores/esp8266/core_esp8266_si2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,24 +293,23 @@ unsigned char twi_readFrom(unsigned char address, unsigned char* buf, unsigned i
}

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
}

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();
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
}
}
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.
}
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?
} else {
return I2C_OK;
}

return I2C_OK;
}

uint8_t twi_transmit(const uint8_t* data, uint8_t length)
Expand Down