Merge pull request #402 from nkrackow/nk/i2c-fix

Bugfix for I2C transaction stop conditions
stm32-rs · Nov 4, 2022 · b8170b5 · b8170b5
2 parents 21d9c06 + edf9dd5
commit b8170b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+* i2c: Fix stop condition not awaited bug [#402]
+
 ## [v0.13.0] 2022-10-06
 
 * **Breaking** Require frequency when initialising adc, use this to set the prescaler [#379]

diff --git a/src/i2c.rs b/src/i2c.rs
@@ -585,6 +585,9 @@ macro_rules! i2c {
                     // Stop
                     self.master_stop();
 
+                    // Wait for stop
+                    busy_wait!(self.i2c, busy, is_not_busy);
+
                     Ok(())
                 }
             }
@@ -631,7 +634,8 @@ macro_rules! i2c {
                         *byte = self.i2c.rxdr.read().rxdata().bits();
                     }
 
-                    // automatic STOP
+                    // Wait for automatic stop
+                    busy_wait!(self.i2c, busy, is_not_busy);
 
                     Ok(())
                 }
@@ -657,7 +661,8 @@ macro_rules! i2c {
                         *byte = self.i2c.rxdr.read().rxdata().bits();
                     }
 
-                    // automatic STOP
+                    // Wait for automatic stop
+                    busy_wait!(self.i2c, busy, is_not_busy);
 
                     Ok(())
                 }