Wire: abort() transaction after timeout

facchinm · facchinm · commit 1da517150906 · 2024-02-19T15:58:21.000+01:00
diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
@@ -486,6 +486,10 @@ uint8_t TwoWire::read_from(uint8_t address, uint8_t* data, uint8_t length, unsig
   if(bus_status == WIRE_STATUS_RX_COMPLETED) {
     return length;
   }
+
+  if(bus_status == WIRE_STATUS_UNSET) {
+    m_abort(&m_i2c_ctrl);
+  }
   
   return 0; /* ???????? return value ??????? */
 }
@@ -518,6 +522,7 @@ uint8_t TwoWire::write_to(uint8_t address, uint8_t* data, uint8_t length, unsign
     }
     else if(bus_status == WIRE_STATUS_UNSET) {
       rv = END_TX_TIMEOUT;
+      m_abort(&m_i2c_ctrl);
     }
     /* as far as I know is impossible to distinguish between NACK on ADDRESS and
       NACK on DATA */

Original file line number	Diff line number	Diff line change
`@@ -486,6 +486,10 @@ uint8_t TwoWire::read_from(uint8_t address, uint8_t* data, uint8_t length, unsig`
`486`	`486`	`if(bus_status == WIRE_STATUS_RX_COMPLETED) {`
`487`	`487`	`return length;`
`488`	`488`	`}`
	`489`	`+`
	`490`	`+ if(bus_status == WIRE_STATUS_UNSET) {`
	`491`	`+ m_abort(&m_i2c_ctrl);`
	`492`	`+ }`
`489`	`493`
`490`	`494`	`return 0; /* ???????? return value ??????? */`
`491`	`495`	`}`
`@@ -518,6 +522,7 @@ uint8_t TwoWire::write_to(uint8_t address, uint8_t* data, uint8_t length, unsign`
`518`	`522`	`}`
`519`	`523`	`else if(bus_status == WIRE_STATUS_UNSET) {`
`520`	`524`	`rv = END_TX_TIMEOUT;`
	`525`	`+ m_abort(&m_i2c_ctrl);`
`521`	`526`	`}`
`522`	`527`	`/* as far as I know is impossible to distinguish between NACK on ADDRESS and`
`523`	`528`	`NACK on DATA */`