From 5e56e9bb12f5dd206019061a64a8d953a844fa8d Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 16 Jun 2024 19:16:52 +0200 Subject: [PATCH] prepare HAL release --- examples/simple/Cargo.toml | 4 ---- examples/simple/examples/blinky-pac.rs | 2 +- examples/simple/examples/cascade.rs | 6 +++--- examples/simple/examples/rtt-log.rs | 1 - va108xx-hal/Cargo.toml | 3 +-- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/examples/simple/Cargo.toml b/examples/simple/Cargo.toml index 391dab6..be52905 100644 --- a/examples/simple/Cargo.toml +++ b/examples/simple/Cargo.toml @@ -31,7 +31,3 @@ features = ["cortex-m-systick"] version = "0.6" path = "../../va108xx-hal" features = ["rt", "defmt"] - -[dependencies.va108xx] -version = "0.3" -path = "../../va108xx" diff --git a/examples/simple/examples/blinky-pac.rs b/examples/simple/examples/blinky-pac.rs index 01aebad..bd5f5ca 100644 --- a/examples/simple/examples/blinky-pac.rs +++ b/examples/simple/examples/blinky-pac.rs @@ -8,7 +8,7 @@ use cortex_m_rt::entry; use panic_halt as _; -use va108xx as pac; +use va108xx_hal::pac; // REB LED pin definitions. All on port A const LED_D2: u32 = 1 << 10; diff --git a/examples/simple/examples/cascade.rs b/examples/simple/examples/cascade.rs index b49fce6..39cebb3 100644 --- a/examples/simple/examples/cascade.rs +++ b/examples/simple/examples/cascade.rs @@ -39,7 +39,7 @@ fn main() -> ! { CountDownTimer::new(&mut dp.sysconfig, 50.MHz(), dp.tim3).auto_disable(true); cascade_triggerer.listen( Event::TimeOut, - IrqCfg::new(va108xx::Interrupt::OC1, true, false), + IrqCfg::new(pac::Interrupt::OC1, true, false), Some(&mut dp.irqsel), Some(&mut dp.sysconfig), ); @@ -62,7 +62,7 @@ fn main() -> ! { // the timer expires cascade_target_1.listen( Event::TimeOut, - IrqCfg::new(va108xx::Interrupt::OC2, true, false), + IrqCfg::new(pac::Interrupt::OC2, true, false), Some(&mut dp.irqsel), Some(&mut dp.sysconfig), ); @@ -88,7 +88,7 @@ fn main() -> ! { // the timer expires cascade_target_2.listen( Event::TimeOut, - IrqCfg::new(va108xx::Interrupt::OC3, true, false), + IrqCfg::new(pac::Interrupt::OC3, true, false), Some(&mut dp.irqsel), Some(&mut dp.sysconfig), ); diff --git a/examples/simple/examples/rtt-log.rs b/examples/simple/examples/rtt-log.rs index 11f55be..55a63db 100644 --- a/examples/simple/examples/rtt-log.rs +++ b/examples/simple/examples/rtt-log.rs @@ -5,7 +5,6 @@ use cortex_m_rt::entry; use panic_halt as _; use rtt_target::{rprintln, rtt_init_print}; -use va108xx as _; #[entry] fn main() -> ! { diff --git a/va108xx-hal/Cargo.toml b/va108xx-hal/Cargo.toml index f632158..8b86b60 100644 --- a/va108xx-hal/Cargo.toml +++ b/va108xx-hal/Cargo.toml @@ -24,8 +24,7 @@ defmt = { version = "0.3", optional = true } delegate = "0.12" [dependencies.va108xx] -version = "0.3.0" -path = "../va108xx" +version = "0.3" default-features = false features = ["critical-section"]