Update to embedded-hal-async 0.2.0-alpha.1

atsamd-rs · May 26, 2023 · ff35b8f · ff35b8f
1 parent 7036a38
commit ff35b8f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/hal/Cargo.toml b/hal/Cargo.toml
@@ -54,9 +54,9 @@ void = {version = "1.0", default-features = false}
 
 cortex-m-interrupt = {version = "0.2.1-git", git = "https://github.com/datdenkikniet/cortex-m-interrupt.git", rev = "9baa936", optional = true}
 defmt = { version = "0.3", optional = true}
-embassy-sync = {version = "0.1", optional = true}
+embassy-sync = {version = "0.2", optional = true}
 embedded-hal-alpha = {package = "embedded-hal", version = "1.0.0-alpha.9"}
-embedded-hal-async = {version = "0.2.0-alpha.0", optional = true}
+embedded-hal-async = {version = "0.2.0-alpha.1", optional = true}
 embedded-sdmmc = {version = "0.3", optional = true}
 fugit = {version = "0.3", optional = true}
 futures = {version = "0.3", default-features = false, features = ["async-await"], optional = true}

diff --git a/hal/src/async_hal/timer.rs b/hal/src/async_hal/timer.rs
@@ -170,24 +170,19 @@ where
 mod impl_ehal {
     use super::*;
     use crate::time::U32Ext;
-    use core::convert::Infallible;
     use embedded_hal_async::delay::DelayUs;
 
     impl<T, I> DelayUs for TimerFuture<T, I>
     where
         T: AsyncCount16,
         I: InterruptNumber,
     {
-        type Error = Infallible;
-
-        async fn delay_ms(&mut self, ms: u32) -> Result<(), Self::Error> {
+        async fn delay_ms(&mut self, ms: u32) {
             self.delay(ms.ms()).await;
-            Ok(())
         }
 
-        async fn delay_us(&mut self, us: u32) -> Result<(), Self::Error> {
+        async fn delay_us(&mut self, us: u32) {
             self.delay(us.us()).await;
-            Ok(())
         }
     }
 }

diff --git a/hal/src/sercom/i2c/async_api.rs b/hal/src/sercom/i2c/async_api.rs
@@ -276,8 +276,8 @@ mod impl_ehal {
         }
 
         #[inline]
-        async fn transaction<'a, 'b>(
-            &'a mut self,
+        async fn transaction<'mut_self, 'a, 'b>(
+            &'mut_self mut self,
             address: u8,
             operations: &'a mut [embedded_hal_async::i2c::Operation<'b>],
         ) -> Result<(), Self::Error> {
@@ -323,8 +323,8 @@ mod impl_ehal {
         }
 
         #[inline]
-        async fn transaction<'a, 'b>(
-            &'a mut self,
+        async fn transaction<'mut_self, 'a, 'b>(
+            &'mut_self mut self,
             address: u8,
             operations: &'a mut [embedded_hal_async::i2c::Operation<'b>],
         ) -> Result<(), Self::Error> {