Merge pull request #176 from usbalbin/merge_from_main2

Merge from main

Author: usbalbin

.vscode/settings.json

@@ -6,6 +6,6 @@
   "rust-analyzer.cargo.target": "thumbv7em-none-eabihf",
   "rust-analyzer.cargo.features": [
     "stm32g473",
-    "defmt-logging",
+    "defmt",
   ]
 }

Cargo.toml

@@ -12,7 +12,7 @@ repository = "https://github.com/stm32-rs/stm32g4xx-hal"
 version = "0.0.2"
 
 [dependencies]
-nb = "0.1.1"
+nb = "1"
 #stm32g4 = { git = "https://github.com/stm32-rs/stm32-rs-nightlies" } #"0.15.1"
 stm32g4 = { version = "0.19.0", package = "stm32g4-staging" }
 paste = "1.0"
@@ -22,13 +22,14 @@ static_assertions = "1.1"
 fugit = "0.3.7"
 stm32-usbd = { version = "0.7.0", optional = true }
 fixed = { version = "1.28.0", optional = true }
+embedded-io = "0.6"
 
 [dependencies.cortex-m]
 version = "0.7.7"
 features = ["critical-section-single-core"]
 
 [dependencies.fdcan]
-version = "0.2.0"
+version = "0.2.1"
 features = ["fdcan_g0_g4_l5"]
 
 [dependencies.cast]
@@ -39,9 +40,13 @@ default-features = false
 features = ["const-fn"]
 version = "0.2.5"
 
-[dependencies.embedded-hal]
+[dependencies.embedded-hal-old]
+package = "embedded-hal"
 features = ["unproven"]
-version = "0.2.4"
+version = "0.2.7"
+
+[dependencies.embedded-hal]
+version = "1.0.0"
 
 [dependencies.embedded-dma]
 version = "0.1.2"
@@ -94,7 +99,7 @@ stm32g4a1 = ["stm32g4/stm32g4a1"]
 log-itm = ["cortex-m-log/itm"]
 log-rtt = []
 log-semihost = ["cortex-m-log/semihosting"]
-defmt = ["dep:defmt", "fugit/defmt"]
+defmt = ["dep:defmt", "fugit/defmt", "nb/defmt-0-3", "embedded-hal/defmt-03", "embedded-io/defmt-03"]
 cordic = ["dep:fixed"]
 
 [profile.dev]

examples/adc-continious-dma.rs

@@ -2,6 +2,7 @@
 #![no_main]
 
 mod utils;
+use utils::logger::info;
 
 use crate::hal::{
     adc::{
@@ -20,7 +21,6 @@ use crate::hal::{
 use stm32g4xx_hal as hal;
 
 use cortex_m_rt::entry;
-use utils::logger::info;
 
 #[entry]
 fn main() -> ! {
@@ -48,6 +48,7 @@ fn main() -> ! {
 
     info!("Setup Adc1");
     let mut delay = cp.SYST.delay(&rcc.clocks);
+
     let mut adc = dp
         .ADC1
         .claim(ClockSource::SystemClock, &rcc, &mut delay, true);

examples/adc-one-shot-dma.rs

@@ -17,10 +17,9 @@ use crate::hal::{
 };
 use stm32g4xx_hal as hal;
 
-use log::info;
-
 #[macro_use]
 mod utils;
+use utils::logger::info;
 
 #[entry]
 fn main() -> ! {
@@ -49,6 +48,7 @@ fn main() -> ! {
 
     info!("Setup Adc1");
     let mut delay = cp.SYST.delay(&rcc.clocks);
+
     let mut adc = dp
         .ADC1
         .claim(ClockSource::SystemClock, &rcc, &mut delay, true);

examples/adc-one-shot.rs

@@ -3,7 +3,6 @@
 
 use crate::hal::{
     adc::{config::SampleTime, AdcClaim},
-    delay::SYSTDelayExt,
     pwr::PwrExt,
     rcc::Config,
     stm32::Peripherals,
@@ -13,10 +12,9 @@ use stm32g4xx_hal as hal;
 
 use cortex_m_rt::entry;
 
-use log::info;
-
 #[macro_use]
 mod utils;
+use utils::logger::info;
 
 #[entry]
 fn main() -> ! {

examples/blinky_delay.rs

@@ -3,7 +3,6 @@
 #![no_main]
 #![no_std]
 
-use hal::delay::DelayFromCountDownTimer;
 use hal::prelude::*;
 use hal::pwr::PwrExt;
 use hal::rcc::Config;
@@ -37,7 +36,7 @@ fn main() -> ! {
 
     info!("Init Timer2 delay");
     let timer2 = Timer::new(dp.TIM2, &rcc.clocks);
-    let mut delay_tim2 = DelayFromCountDownTimer::new(timer2.start_count_down(100.millis()));
+    let mut delay_tim2 = timer2.start_count_down(100.millis()).delay();
 
     loop {
         info!("Toggle");
@@ -47,6 +46,6 @@ fn main() -> ! {
         info!("Toggle");
         led.toggle().unwrap();
         info!("TIM2 delay");
-        delay_tim2.delay_ms(1000_u16);
+        delay_tim2.delay_ms(1000);
     }
 }

examples/button.rs

@@ -14,7 +14,7 @@ use core::cell::RefCell;
 use core::sync::atomic::{AtomicBool, Ordering};
 use cortex_m::{asm::wfi, interrupt::Mutex};
 use cortex_m_rt::entry;
-use embedded_hal::digital::v2::OutputPin;
+use embedded_hal::digital::OutputPin;
 
 type ButtonPin = gpioc::PC13<Input<PullDown>>;
 

examples/can-echo.rs

@@ -22,10 +22,9 @@ use core::num::{NonZeroU16, NonZeroU8};
 
 use cortex_m_rt::entry;
 
-use log::info;
-
 #[macro_use]
 mod utils;
+use utils::logger::info;
 
 #[entry]
 fn main() -> ! {
@@ -116,7 +115,7 @@ fn main() -> ! {
         bit_rate_switching: false,
         marker: None,
     };
-    info!("Initial Header: {:#X?}", &header);
+    info!("Initial Header: {:#?}", &header);
 
     info!("Transmit initial message");
     block!(can.transmit(header, &buffer)).unwrap();

examples/comp_w_dac.rs

@@ -10,7 +10,6 @@ use rt::entry;
 
 #[entry]
 fn main() -> ! {
-    use embedded_hal::Direction;
     use hal::comparator::{self, ComparatorExt, ComparatorSplit};
     use hal::dac::{Dac1IntSig1, DacExt, DacOut};
     use hal::delay::SYSTDelayExt;
@@ -49,6 +48,11 @@ fn main() -> ! {
     comp.output_pin(led2);
     let _comp1 = comp.enable().lock();
 
+    enum Direction {
+        Upcounting,
+        Downcounting,
+    }
+
     let mut dir = Direction::Upcounting;
     let mut val = 0;
 

examples/dac.rs

@@ -8,7 +8,6 @@
 #![no_main]
 #![no_std]
 
-use embedded_hal::Direction;
 use hal::dac::{DacExt, DacOut, GeneratorConfig};
 use hal::delay::SYSTDelayExt;
 use hal::gpio::GpioExt;
@@ -37,6 +36,11 @@ fn main() -> ! {
     // dac_generator will have its value set automatically from its internal noise generator
     let mut dac_generator = dac1ch2.enable_generator(GeneratorConfig::noise(11));
 
+    enum Direction {
+        Upcounting,
+        Downcounting,
+    }
+
     let mut dir = Direction::Upcounting;
     let mut val = 0;