Merge pull request #720 from stm32-rs/ehal-swap

swap embedded-hals

Author: therealprof

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - shorten gpio ptr access
 - bump embedded-hal to `1.0` (no more RC!)
+- make `embedded-hal` `1.0` main implementation
 
 ## [v0.19.0] - 2023-12-11
 

Cargo.toml

@@ -39,8 +39,6 @@ sdio-host = { version = "0.6.0", optional = true }
 embedded-dma = "0.2.0"
 bare-metal = { version = "1" }
 void = { default-features = false, version = "1.0.2" }
-embedded-hal = { features = ["unproven"], version = "0.2.7" }
-embedded-hal-nb = "1.0"
 display-interface = { version = "0.4.1", optional = true }
 fugit = "0.3.7"
 fugit-timer = "0.1.3"
@@ -54,9 +52,16 @@ vcell = "0.1.3"
 version = "0.3.14"
 default-features = false
 
-[dependencies.embedded-hal-one]
-version = "1.0"
+[dependencies.embedded-hal-02]
 package = "embedded-hal"
+version = "0.2.7"
+features = ["unproven"]
+
+[dependencies.embedded-hal]
+version = "1.0"
+
+[dependencies.embedded-hal-nb]
+version = "1.0"
 
 [dependencies.stm32_i2s_v12x]
 version = "0.5.0"

examples/analog-stopwatch-with-spi-ssd1306.rs

@@ -113,7 +113,7 @@ fn main() -> ! {
     let mut delay = Timer::syst(cp.SYST, &clocks).delay();
 
     ss.set_high();
-    delay.delay_ms(100_u32);
+    delay.delay_ms(100);
     ss.set_low();
 
     // Set up the display
@@ -201,7 +201,7 @@ fn main() -> ! {
 
         disp.flush().unwrap();
 
-        delay.delay_ms(100u32);
+        delay.delay_ms(100);
     }
 }
 

examples/delay-syst-blinky.rs

@@ -33,7 +33,7 @@ fn main() -> ! {
         loop {
             // On for 1s, off for 1s.
             led.toggle();
-            delay.delay_ms(1000_u32);
+            delay.delay_ms(1000);
         }
     }
 

examples/delay-timer-blinky.rs

@@ -33,8 +33,8 @@ fn main() -> ! {
         loop {
             // On for 1s, off for 3s.
             led.set_high();
-            // Use `embedded_hal::DelayMs` trait
-            delay.delay_ms(1000_u32);
+            // Use `embedded_hal_02::DelayMs` trait
+            delay.delay_ms(1000);
             led.set_low();
             // or use `fugit::ExtU32` trait
             delay.delay(3.secs());

examples/dwt-blinky.rs

@@ -40,13 +40,13 @@ fn main() -> ! {
             // On for 1s, off for 1s.
             led1.set_high();
             led2.set_low();
-            delay.delay_ms(1000_u32);
+            delay.delay_ms(1000);
             sw.lap();
             led1.set_low();
             led2.set_high();
-            delay.delay_ms(900_u32);
+            delay.delay_ms(900);
             // Also you can measure with almost clock precision
-            let cd: ClockDuration = dwt.measure(|| delay.delay_ms(100_u32));
+            let cd: ClockDuration = dwt.measure(|| delay.delay_ms(100));
             let _t: u32 = cd.as_ticks(); // Should return 48MHz * 0.1s as u32
             let _t: f32 = cd.as_secs_f32(); // Should return ~0.1s as a f32
             let _t: f64 = cd.as_secs_f64(); // Should return ~0.1s as a f64

examples/ist7920-bidi-normal-spi.rs

@@ -57,7 +57,7 @@ fn main() -> ! {
 
     let mut select_figure = 0;
     loop {
-        delay.delay_ms(500_u16);
+        delay.delay_ms(500);
         let (begin, end) = match select_figure {
             0 => {
                 select_figure = 1;

examples/qei.rs

@@ -13,7 +13,7 @@
 use panic_halt as _;
 
 use cortex_m_rt::entry;
-use embedded_hal::Direction as RotaryDirection;
+use embedded_hal_02::Direction as RotaryDirection;
 use stm32f4xx_hal::{pac, prelude::*, qei::Qei};
 
 #[entry]
@@ -58,6 +58,6 @@ fn main() -> ! {
             current_count = new_count;
         }
 
-        delay.delay_ms(10_u32);
+        delay.delay_ms(10);
     }
 }

examples/rng-display.rs

@@ -105,7 +105,7 @@ fn main() -> ! {
             }
             disp.flush().unwrap();
             //delay a little while between refreshes so the display is readable
-            delay_source.delay_ms(100u8);
+            delay_source.delay_ms(100);
         }
     }
 

examples/rtic-spi-slave-dma.rs

@@ -6,7 +6,7 @@
 #[rtic::app(device = stm32f4xx_hal::pac, peripherals = true, dispatchers = [TIM2])]
 mod app {
 
-    use embedded_hal::spi::{Mode, Phase, Polarity};
+    use embedded_hal_02::spi::{Mode, Phase, Polarity};
     use hal::{
         dma::{
             config::DmaConfig, DmaFlag, MemoryToPeripheral, PeripheralToMemory, Stream0, Stream5,