Add support for embedded_hal v 1.0.0

Author: david-sawatzke

Cargo.toml

@@ -15,9 +15,8 @@ readme = "README.md"
 repository = "https://github.com/smart-leds-rs/ws2812-spi-rs"
 
 [dependencies]
-nb = "1.1.0"
 smart-leds-trait = "0.3.0"
-embedded-hal = "0.2.7"
+embedded-hal = "1.0.0"
 
 [features]
 mosi_idle_high = []

src/lib.rs

@@ -3,7 +3,7 @@
 //! - For usage with `smart-leds`
 //! - Implements the `SmartLedsWrite` trait
 //!
-//! Needs a type implementing the `spi::FullDuplex` trait.
+//! Needs a type implementing the `spi::SpiBus` trait.
 //!
 //! The spi peripheral should run at 2MHz to 3.8 MHz
 
@@ -16,14 +16,13 @@ use embedded_hal as hal;
 
 pub mod prerendered;
 
-use hal::spi::{FullDuplex, Mode, Phase, Polarity};
+use hal::spi::{Mode, Phase, Polarity, SpiBus};
 
 use core::marker::PhantomData;
+use core::slice::from_ref;
 
 use smart_leds_trait::{SmartLedsWrite, RGB8, RGBW};
 
-use nb::block;
-
 /// SPI mode that can be used for this crate
 ///
 /// Provided for convenience
@@ -45,7 +44,7 @@ pub struct Ws2812<SPI, DEVICE = devices::Ws2812> {
 
 impl<SPI, E> Ws2812<SPI>
 where
-    SPI: FullDuplex<u8, Error = E>,
+    SPI: SpiBus<u8, Error = E>,
 {
     /// Use ws2812 devices via spi
     ///
@@ -65,7 +64,7 @@ where
 
 impl<SPI, E> Ws2812<SPI, devices::Sk6812w>
 where
-    SPI: FullDuplex<u8, Error = E>,
+    SPI: SpiBus<u8, Error = E>,
 {
     /// Use sk6812w devices via spi
     ///
@@ -87,7 +86,7 @@ where
 
 impl<SPI, D, E> Ws2812<SPI, D>
 where
-    SPI: FullDuplex<u8, Error = E>,
+    SPI: SpiBus<u8, Error = E>,
 {
     /// Write a single byte for ws2812 devices
     fn write_byte(&mut self, mut data: u8) -> Result<(), E> {
@@ -97,8 +96,7 @@ where
         let patterns = [0b1000_1000, 0b1000_1110, 0b11101000, 0b11101110];
         for _ in 0..4 {
             let bits = (data & 0b1100_0000) >> 6;
-            block!(self.spi.send(patterns[bits as usize]))?;
-            block!(self.spi.read()).ok();
+            self.spi.write(from_ref(&patterns[bits as usize]))?;
             data <<= 2;
         }
         Ok(())
@@ -107,16 +105,15 @@ where
     fn flush(&mut self) -> Result<(), E> {
         // Should be > 300μs, so for an SPI Freq. of 3.8MHz, we have to send at least 1140 low bits or 140 low bytes
         for _ in 0..140 {
-            block!(self.spi.send(0))?;
-            block!(self.spi.read()).ok();
+            self.spi.write(from_ref(&0))?;
         }
         Ok(())
     }
 }
 
 impl<SPI, E> SmartLedsWrite for Ws2812<SPI>
 where
-    SPI: FullDuplex<u8, Error = E>,
+    SPI: SpiBus<u8, Error = E>,
 {
     type Error = E;
     type Color = RGB8;
@@ -126,10 +123,6 @@ where
         T: IntoIterator<Item = I>,
         I: Into<Self::Color>,
     {
-        // We introduce an offset in the fifo here, so there's always one byte in transit
-        // Some MCUs (like the stm32f1) only a one byte fifo, which would result
-        // in overrun error if two bytes need to be stored
-        block!(self.spi.send(0))?;
         if cfg!(feature = "mosi_idle_high") {
             self.flush()?;
         }
@@ -141,15 +134,13 @@ where
             self.write_byte(item.b)?;
         }
         self.flush()?;
-        // Now, resolve the offset we introduced at the beginning
-        block!(self.spi.read())?;
         Ok(())
     }
 }
 
 impl<SPI, E> SmartLedsWrite for Ws2812<SPI, devices::Sk6812w>
 where
-    SPI: FullDuplex<u8, Error = E>,
+    SPI: SpiBus<u8, Error = E>,
 {
     type Error = E;
     type Color = RGBW<u8, u8>;
@@ -159,10 +150,6 @@ where
         T: IntoIterator<Item = I>,
         I: Into<Self::Color>,
     {
-        // We introduce an offset in the fifo here, so there's always one byte in transit
-        // Some MCUs (like the stm32f1) only a one byte fifo, which would result
-        // in overrun error if two bytes need to be stored
-        block!(self.spi.send(0))?;
         if cfg!(feature = "mosi_idle_high") {
             self.flush()?;
         }
@@ -175,8 +162,6 @@ where
             self.write_byte(item.a.0)?;
         }
         self.flush()?;
-        // Now, resolve the offset we introduced at the beginning
-        block!(self.spi.read())?;
         Ok(())
     }
 }

src/prerendered.rs

@@ -5,15 +5,13 @@
 
 use embedded_hal as hal;
 
-use hal::spi::{FullDuplex, Mode, Phase, Polarity};
+use hal::spi::{Mode, Phase, Polarity, SpiBus};
 
 use core::marker::PhantomData;
+use core::slice::from_ref;
 
 use smart_leds_trait::{SmartLedsWrite, RGB8, RGBW};
 
-use nb;
-use nb::block;
-
 /// SPI mode that can be used for this crate
 ///
 /// Provided for convenience
@@ -43,7 +41,7 @@ pub struct Ws2812<'a, SPI, DEVICE = devices::Ws2812> {
 
 impl<'a, SPI, E> Ws2812<'a, SPI>
 where
-    SPI: FullDuplex<u8, Error = E>,
+    SPI: SpiBus<u8, Error = E>,
 {
     /// Use ws2812 devices via spi
     ///
@@ -68,7 +66,7 @@ where
 
 impl<'a, SPI, E> Ws2812<'a, SPI, devices::Sk6812w>
 where
-    SPI: FullDuplex<u8, Error = E>,
+    SPI: SpiBus<u8, Error = E>,
 {
     /// Use sk6812w devices via spi
     ///
@@ -95,7 +93,7 @@ where
 
 impl<'a, SPI, D, E> Ws2812<'a, SPI, D>
 where
-    SPI: FullDuplex<u8, Error = E>,
+    SPI: SpiBus<u8, Error = E>,
 {
     /// Write a single byte for ws2812 devices
     fn write_byte(&mut self, mut data: u8) -> Result<(), Error<E>> {
@@ -117,33 +115,23 @@ where
     }
 
     fn send_data(&mut self) -> Result<(), E> {
-        // We introduce an offset in the fifo here, so there's always one byte in transit
-        // Some MCUs (like the stm32f1) only a one byte fifo, which would result
-        // in overrun error if two bytes need to be stored
-        block!(self.spi.send(0))?;
         if cfg!(feature = "mosi_idle_high") {
             for _ in 0..140 {
-                block!(self.spi.send(0))?;
-                block!(self.spi.read())?;
+                self.spi.write(from_ref(&0))?;
             }
         }
-        for b in self.data[..self.index].iter() {
-            block!(self.spi.send(*b))?;
-            block!(self.spi.read())?;
-        }
+
+        self.spi.write(&self.data[..self.index])?;
         for _ in 0..140 {
-            block!(self.spi.send(0))?;
-            block!(self.spi.read())?;
+            self.spi.write(from_ref(&0))?;
         }
-        // Now, resolve the offset we introduced at the beginning
-        block!(self.spi.read())?;
         Ok(())
     }
 }
 
 impl<'a, SPI, E> SmartLedsWrite for Ws2812<'a, SPI>
 where
-    SPI: FullDuplex<u8, Error = E>,
+    SPI: SpiBus<u8, Error = E>,
 {
     type Error = Error<E>;
     type Color = RGB8;
@@ -167,7 +155,7 @@ where
 
 impl<'a, SPI, E> SmartLedsWrite for Ws2812<'a, SPI, devices::Sk6812w>
 where
-    SPI: FullDuplex<u8, Error = E>,
+    SPI: SpiBus<u8, Error = E>,
 {
     type Error = Error<E>;
     type Color = RGBW<u8, u8>;