Skip to content

esp32: fix I2C timeouts on larger transfers #5674

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

Open
pottekkat wants to merge 1 commit into
base: dev
Choose a base branch
from
+17 −8
Open

esp32: fix I2C timeouts on larger transfers #5674

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 17 additions & 8 deletions src/machine/machine_esp32_i2c.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ func (i2c *I2C) transmit(addr uint16, cmd []i2cCommand, timeoutMS int) error {
timeoutNS := int64(timeoutMS) * 1000000
needAddress := true
needRestart := false
isRead := false
var readTo []byte
for cmdIdx, reg := 0, &i2c.Bus.COMD0; cmdIdx < len(cmd); {
c := &cmd[cmdIdx]
Expand All @@ -253,6 +254,7 @@ func (i2c *I2C) transmit(addr uint16, cmd []i2cCommand, timeoutMS int) error {
cmdIdx++

case i2cCMD_WRITE:
isRead = false
count := 32
if needAddress {
needAddress = false
Expand All @@ -266,15 +268,16 @@ func (i2c *I2C) transmit(addr uint16, cmd []i2cCommand, timeoutMS int) error {
reg.Set(i2cCMD_WRITE | uint32(32-count))
reg = nextAddress(reg)

if c.head < len(c.data) {
reg.Set(i2cCMD_END)
reg = nil
} else {
// A resuming segment must not overwrite the slot with END.
reg.Set(i2cCMD_END)
reg = nil
if c.head >= len(c.data) {
cmdIdx++
}
needRestart = true

case i2cCMD_READ:
isRead = true
if needAddress {
needAddress = false
i2c.Bus.SetDATA_FIFO_RDATA((uint32(addr)&0x7f)<<1 | 1)
Expand Down Expand Up @@ -308,10 +311,16 @@ func (i2c *I2C) transmit(addr uint16, cmd []i2cCommand, timeoutMS int) error {
reg = nextAddress(reg)
}

if split {
if split && bytes > 0 {
reg.Set(i2cCMD_END)
readTo = c.data[c.head : c.head+bytes]
reg = nil
} else if split {
reg.Set(i2cCMD_READLAST | 1)
reg = nextAddress(reg)
readTo = c.data[c.head : c.head+bytes+1] // read bytes + 1 last byte
reg.Set(i2cCMD_END)
readTo = c.data[c.head : c.head+1]
reg = nil
cmdIdx++
} else {
reg.Set(i2cCMD_END)
Expand All @@ -333,7 +342,7 @@ func (i2c *I2C) transmit(addr uint16, cmd []i2cCommand, timeoutMS int) error {
if nanotime() > end {
// timeout leaves the bus in an undefined state, reset
i2c.resetBus()
if readTo != nil {
if isRead {
return errI2CReadTimeout
}
return errI2CWriteTimeout
Expand All @@ -345,7 +354,7 @@ func (i2c *I2C) transmit(addr uint16, cmd []i2cCommand, timeoutMS int) error {
case mask&esp.I2C_INT_STATUS_TIME_OUT_INT_ST_Msk != 0:
// timeout leaves the bus in an undefined state, reset
i2c.resetBus()
if readTo != nil {
if isRead {
return errI2CReadTimeout
}
return errI2CWriteTimeout
Expand Down
Loading