Merge pull request #591 from agprimatic/master

facchinm · web-flow · commit a38aba745be1 · 2021-10-20T15:58:04.000+02:00
Fix I2C Master hang when communicating with bad I2C slaves.
diff --git a/cores/arduino/SERCOM.cpp b/cores/arduino/SERCOM.cpp
@@ -568,8 +568,8 @@ bool SERCOM::sendDataMasterWIRE(uint8_t data)
   while(!sercom->I2CM.INTFLAG.bit.MB) {
 
     // If a bus error occurs, the MB bit may never be set.
-    // Check the bus error bit and bail if it's set.
-    if (sercom->I2CM.STATUS.bit.BUSERR) {
+    // Check the bus error bit and ARBLOST bit and bail if either is set.
+    if (sercom->I2CM.STATUS.bit.BUSERR || sercom->I2CM.STATUS.bit.ARBLOST) {
       return false;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -568,8 +568,8 @@ bool SERCOM::sendDataMasterWIRE(uint8_t data)`
`568`	`568`	`while(!sercom->I2CM.INTFLAG.bit.MB) {`
`569`	`569`
`570`	`570`	`// If a bus error occurs, the MB bit may never be set.`
`571`		`- // Check the bus error bit and bail if it's set.`
`572`		`- if (sercom->I2CM.STATUS.bit.BUSERR) {`
	`571`	`+ // Check the bus error bit and ARBLOST bit and bail if either is set.`
	`572`	`+ if (sercom->I2CM.STATUS.bit.BUSERR \|\| sercom->I2CM.STATUS.bit.ARBLOST) {`
`573`	`573`	`return false;`
`574`	`574`	`}`
`575`	`575`	`}`