Adapt to embedded-hal 1.0.0-alpha.1

Author: eldruin

Cargo.toml

@@ -22,27 +22,23 @@ features = ["stm32h743", "rt"]
 targets = ["thumbv7em-none-eabihf"]
 
 [dependencies]
-embedded-hal = "0.2.4"
+embedded-hal = "=1.0.0-alpha.1"
 cortex-m = "^0.6.2"
 cortex-m-rt = "^0.6.12"
 stm32h7 = "0.11.0"
-void = { version = "1.0.2", default-features = false }
 cast = { version = "0.2.3", default-features = false }
-nb = "0.1.2"
+nb = "1"
 paste = "0.1.18"
 
 [dependencies.bare-metal]
-version = "0.2.5"
-features = ["const-fn"]
+version = "1"
 
 [dev-dependencies]
 panic-itm = "~0.4.1"
 cortex-m-rtic = "0.5.3"
 cortex-m-log = { version = "~0.6", features = ["itm"] }
 
 [features]
-default = ["unproven"]
-unproven = ["embedded-hal/unproven"]
 device-selected = []
 revision_v = []
 singlecore = []
@@ -89,3 +85,4 @@ required-features = ["revision_v"]
 [[example]]
 name = "qspi"
 required-features = ["quadspi"]
+

examples/adc.rs

@@ -73,7 +73,7 @@ fn main() -> ! {
     let mut channel = gpioc.pc0.into_analog(); // ANALOG IN 10
 
     loop {
-        let data: u32 = adc1.read(&mut channel).unwrap();
+        let data: u32 = adc1.try_read(&mut channel).unwrap();
         // voltage = reading * (vref/resolution)
         println!(
             log,

examples/adc12.rs

@@ -67,8 +67,8 @@ fn main() -> ! {
     let mut channel_pc3 = gpioc.pc3.into_analog(); // AIN 13
 
     loop {
-        let data_pc2: u32 = adc1.read(&mut channel_pc2).unwrap();
-        let data_pc3: u32 = adc2.read(&mut channel_pc3).unwrap();
+        let data_pc2: u32 = adc1.try_read(&mut channel_pc2).unwrap();
+        let data_pc3: u32 = adc2.try_read(&mut channel_pc3).unwrap();
         // voltage = reading * (vref/resolution)
         println!(log, "ADC readings: {} {}", data_pc2, data_pc3);
     }

examples/blinky.rs

@@ -6,7 +6,7 @@
 extern crate panic_itm;
 
 use cortex_m_rt::entry;
-use stm32h7xx_hal::hal::digital::v2::OutputPin;
+use stm32h7xx_hal::hal::digital::OutputPin;
 use stm32h7xx_hal::{pac, prelude::*};
 
 use cortex_m_log::println;
@@ -44,11 +44,11 @@ fn main() -> ! {
 
     loop {
         loop {
-            led.set_high().unwrap();
-            delay.delay_ms(500_u16);
+            led.try_set_high().unwrap();
+            delay.try_delay_ms(500_u16).unwrap();
 
-            led.set_low().unwrap();
-            delay.delay_ms(500_u16);
+            led.try_set_low().unwrap();
+            delay.try_delay_ms(500_u16).unwrap();
         }
     }
 }

examples/blinky_random.rs

@@ -6,7 +6,7 @@
 extern crate panic_itm;
 
 use cortex_m_rt::entry;
-use stm32h7xx_hal::hal::digital::v2::ToggleableOutputPin;
+use stm32h7xx_hal::hal::digital::ToggleableOutputPin;
 use stm32h7xx_hal::{pac, prelude::*};
 
 use cortex_m_log::println;
@@ -61,8 +61,8 @@ fn main() -> ! {
                 // acceptable for your application.
                 let period = random % 200_u32;
 
-                led.toggle().unwrap();
-                delay.delay_ms(period);
+                led.try_toggle().unwrap();
+                delay.try_delay_ms(period).unwrap();
             }
             Err(err) => println!(log, "RNG error: {:?}", err),
         }

examples/blinky_timer.rs

@@ -9,7 +9,7 @@ extern crate panic_itm;
 extern crate nb;
 
 use cortex_m_rt::entry;
-use stm32h7xx_hal::hal::digital::v2::{OutputPin, ToggleableOutputPin};
+use stm32h7xx_hal::hal::digital::{OutputPin, ToggleableOutputPin};
 use stm32h7xx_hal::{pac, prelude::*};
 
 use cortex_m_log::println;
@@ -41,7 +41,7 @@ fn main() -> ! {
 
     // Configure PE1 as output.
     let mut led = gpioe.pe1.into_push_pull_output();
-    led.set_low().unwrap();
+    led.try_set_low().unwrap();
 
     // Get the delay provider.
     let mut delay = cp.SYST.delay(ccdr.clocks);
@@ -52,14 +52,14 @@ fn main() -> ! {
     loop {
         for _ in 0..5 {
             // 20ms wait with timer
-            led.toggle().unwrap();
-            timer.start(20.ms());
-            block!(timer.wait()).ok();
+            led.try_toggle().unwrap();
+            timer.try_start(20.ms()).unwrap();
+            block!(timer.try_wait()).ok();
 
             // Delay for 500ms. Timer must operate correctly on next
             // use.
-            led.toggle().unwrap();
-            delay.delay_ms(500_u16);
+            led.try_toggle().unwrap();
+            delay.try_delay_ms(500_u16).unwrap();
         }
     }
 }

examples/dac.rs

@@ -7,7 +7,7 @@ extern crate panic_itm;
 
 use cortex_m::asm;
 use cortex_m_rt::entry;
-use stm32h7xx_hal::hal::Direction;
+use stm32h7xx_hal::hal::qei::Direction;
 use stm32h7xx_hal::{pac, prelude::*};
 
 use stm32h7xx_hal::traits::DacOut;

examples/i2c.rs

@@ -41,6 +41,6 @@ fn main() -> ! {
     let mut buf = [0x60];
     loop {
         buf[0] = 0x11;
-        i2c.write_read(0x76, &buf.clone(), &mut buf).unwrap();
+        i2c.try_write_read(0x76, &buf.clone(), &mut buf).unwrap();
     }
 }

examples/pwm.rs

@@ -51,23 +51,23 @@ fn main() -> ! {
             .pwm(pins, 10.khz(), ccdr.peripheral.TIM1, &ccdr.clocks);
 
     // Output PWM on PA8
-    let max = pwm.get_max_duty();
-    pwm.set_duty(max / 2);
+    let max = pwm.try_get_max_duty().unwrap();
+    pwm.try_set_duty(max / 2).unwrap();
 
     println!(log, "50%");
-    pwm.enable();
+    pwm.try_enable().unwrap();
     asm::bkpt();
 
     println!(log, "25%");
-    pwm.set_duty(max / 4);
+    pwm.try_set_duty(max / 4).unwrap();
     asm::bkpt();
 
     println!(log, "12.5%");
-    pwm.set_duty(max / 8);
+    pwm.try_set_duty(max / 8).unwrap();
     asm::bkpt();
 
     println!(log, "100%");
-    pwm.set_duty(max);
+    pwm.try_set_duty(max).unwrap();
     asm::bkpt();
 
     loop {}

examples/rtic.rs

@@ -6,7 +6,7 @@
 extern crate panic_itm;
 extern crate rtic;
 
-use stm32h7xx_hal::hal::digital::v2::ToggleableOutputPin;
+use stm32h7xx_hal::hal::digital::ToggleableOutputPin;
 
 use rtic::app;
 use stm32h7xx_hal::gpio::{gpioc::PC13, gpioi::PI13};
@@ -52,6 +52,6 @@ const APP: () = {
     #[task(binds = EXTI15_10, resources = [button, led])]
     fn button_click(ctx: button_click::Context) {
         ctx.resources.button.clear_interrupt_pending_bit();
-        ctx.resources.led.toggle().unwrap();
+        ctx.resources.led.try_toggle().unwrap();
     }
 };