Feature/qingke v4 delay

examples/ch32v307/src/bin/blinky.rs

@@ -3,39 +3,19 @@
 #![feature(type_alias_impl_trait)]
 #![feature(impl_trait_in_assoc_type)]
 
-use embassy_executor::Spawner;
-use embassy_time::{Duration, Timer};
-use hal::gpio::{AnyPin, Level, Output, Pin};
+use hal::delay::Delay;
+use hal::gpio::{Level, Output};
 use {ch32_hal as hal, panic_halt as _};
 
-#[embassy_executor::task(pool_size = 3)]
-async fn blink(pin: AnyPin, interval_ms: u64) {
-    let mut led = Output::new(pin, Level::Low, Default::default());
-
-    loop {
-        led.set_high();
-        Timer::after(Duration::from_millis(interval_ms)).await;
-        led.set_low();
-        Timer::after(Duration::from_millis(interval_ms)).await;
-    }
-}
-
-#[embassy_executor::main(entry = "qingke_rt::entry")]
-async fn main(spawner: Spawner) -> ! {
-    hal::debug::SDIPrint::enable();
+#[qingke_rt::entry]
+fn main() -> ! {
     let p = hal::init(Default::default());
-    hal::println!("init embassy");
-
-    hal::embassy::init();
 
-    hal::println!("init ok");
+    let mut led = Output::new(p.PA15, Level::Low, Default::default());
+    let mut delay = Delay;
 
-    // GPIO
-    spawner.spawn(blink(p.PA15.degrade(), 1000)).unwrap();
-    spawner.spawn(blink(p.PB4.degrade(), 500)).unwrap();
-    // spawner.spawn(blink(p.PB8.degrade(), 100)).unwrap();
     loop {
-        Timer::after_millis(2000).await;
-        hal::println!("tick");
+        led.toggle();
+        delay.delay_ms(1000);
     }
 }

examples/ch32v307/src/bin/embassy_blinky.rs

@@ -0,0 +1,35 @@
+#![no_std]
+#![no_main]
+#![feature(type_alias_impl_trait)]
+#![feature(impl_trait_in_assoc_type)]
+
+use embassy_executor::Spawner;
+use embassy_time::{Duration, Timer};
+use hal::gpio::{AnyPin, Level, Output, Pin};
+use {ch32_hal as hal, panic_halt as _};
+
+#[embassy_executor::task(pool_size = 3)]
+async fn blink(pin: AnyPin, interval_ms: u64) {
+    let mut led = Output::new(pin, Level::Low, Default::default());
+
+    loop {
+        led.set_high();
+        Timer::after(Duration::from_millis(interval_ms)).await;
+        led.set_low();
+        Timer::after(Duration::from_millis(interval_ms)).await;
+    }
+}
+
+#[embassy_executor::main(entry = "qingke_rt::entry")]
+async fn main(spawner: Spawner) -> ! {
+    let p = hal::init(Default::default());
+    hal::embassy::init();
+
+    // GPIO
+    spawner.spawn(blink(p.PA15.degrade(), 1000)).unwrap();
+    spawner.spawn(blink(p.PB4.degrade(), 100)).unwrap();
+    // spawner.spawn(blink(p.PB8.degrade(), 100)).unwrap();
+    loop {
+        Timer::after_millis(2000).await;
+    }
+}

src/delay/impl_qingke_v2.rs → src/delay/impl_qingke_v2_v4.rs

@@ -1,4 +1,4 @@
-//! SYSTICK based delay implementation for Qingke V2
+//! SYSTICK based delay implementation for Qingke V2 and V4
 
 use pac::systick::vals;
 

src/delay/mod.rs

@@ -1,5 +1,5 @@
-#[cfg(qingke_v2)]
-#[path = "./impl_qingke_v2.rs"]
+#[cfg(any(qingke_v2, qingke_v4))]
+#[path = "./impl_qingke_v2_v4.rs"]
 mod delay_impl;
 
 #[cfg(qingke_v3)]

src/lib.rs

@@ -50,7 +50,7 @@ mod interrupt_ext;
 
 pub use crate::_generated::{peripherals, Peripherals};
 
-#[cfg(any(systick_rv2, systick_rv3))]
+#[cfg(not(time_driver_systick))]
 pub mod delay;
 pub mod dma;
 
@@ -115,7 +115,7 @@ pub fn init(config: Config) -> Peripherals {
     unsafe {
         rcc::init(config.rcc);
 
-        #[cfg(any(systick_rv2, systick_rv3))]
+        #[cfg(any(systick_rv2, systick_rv3, systick_rv4))]
         delay::Delay::init();
     }