Fix errors in examples

usbalbin · usbalbin · commit 5504074ab708 · 2025-05-26T20:43:46.000+02:00
diff --git a/examples/hrtim/adc-trigger.rs b/examples/hrtim/adc-trigger.rs
@@ -1,9 +1,12 @@
 #![no_std]
 #![no_main]
 
+#[path = "../utils/mod.rs"]
+mod utils;
+use utils::logger::info;
+
 /// Example showcasing the use of the HRTIM peripheral to trigger the ADC at various points of the switch cycle off HRTIM_TIMA
 use cortex_m_rt::entry;
-use panic_probe as _;
 use stm32_hrtim::{
     compare_register::HrCompareRegister, output::HrOutput, timer::HrTimer, HrParts, HrPwmAdvExt,
     Pscl4,
@@ -23,14 +26,14 @@ use stm32g4xx_hal::{
 fn main() -> ! {
     const VREF: f32 = 3.3;
 
-    defmt::info!("start");
+    info!("start");
 
     let dp = Peripherals::take().unwrap();
     let cp = CorePeripherals::take().expect("cannot take core peripherals");
 
     // Set system frequency to 16MHz * 15/1/2 = 120MHz
     // This would lead to HrTim running at 120MHz * 32 = 3.84...
-    defmt::info!("rcc");
+    info!("rcc");
     let pwr = dp.PWR.constrain().freeze();
     let mut rcc = dp.RCC.freeze(
         rcc::Config::pll().pll_cfg(rcc::PllConfig {
@@ -52,7 +55,7 @@ fn main() -> ! {
         .circular_buffer(true)
         .memory_increment(true);
 
-    defmt::info!("Setup Gpio");
+    info!("Setup Gpio");
     let gpioa = dp.GPIOA.split(&mut rcc);
     let pa0 = gpioa.pa0.into_analog();
 
@@ -102,7 +105,7 @@ fn main() -> ! {
     out1.enable_set_event(&timer); // Set high at new period
     out2.enable_set_event(&timer);
 
-    defmt::info!("Setup Adc1");
+    info!("Setup Adc1");
     let mut adc12_common = dp.ADC12_COMMON.claim(Default::default(), &mut rcc);
     let mut adc = adc12_common.claim(dp.ADC1, &mut delay);
 
@@ -124,7 +127,7 @@ fn main() -> ! {
         adc::config::SampleTime::Cycles_640_5,
     );
 
-    defmt::info!("Setup DMA");
+    info!("Setup DMA");
     let first_buffer = cortex_m::singleton!(: [u16; 10] = [0; 10]).unwrap();
 
     let mut transfer = dma1ch1.into_circ_peripheral_to_memory_transfer(
@@ -144,16 +147,16 @@ fn main() -> ! {
         let mut b = [0_u16; 4];
         let r = transfer.read_exact(&mut b);
 
-        defmt::info!("read: {}", r);
+        info!("read: {}", r);
         assert!(r == b.len());
 
         let millivolts = Vref::sample_to_millivolts((b[0] + b[2]) / 2);
-        defmt::info!("pa3: {}mV", millivolts);
+        info!("pa3: {}mV", millivolts);
         let temp = Temperature::temperature_to_degrees_centigrade(
             (b[1] + b[3]) / 2,
             VREF,
             adc::config::Resolution::Twelve,
         );
-        defmt::info!("temp: {}℃C", temp);
+        info!("temp: {}℃C", temp);
     }
 }
diff --git a/examples/hrtim/capture-dma.rs b/examples/hrtim/capture-dma.rs
@@ -1,9 +1,12 @@
 #![no_std]
 #![no_main]
 
+#[path = "../utils/mod.rs"]
+mod utils;
+use utils::logger::info;
+
 /// Example showcasing the use of the HRTIM peripheral's capture function to detect phase shift between a digital event and the output of HRTIM_TIMA
 use cortex_m_rt::entry;
-use panic_probe as _;
 use stm32_hrtim::{
     capture,
     compare_register::HrCompareRegister,
@@ -23,13 +26,13 @@ use stm32g4xx_hal::{
 
 #[entry]
 fn main() -> ! {
-    defmt::info!("start");
+    info!("start");
 
     let dp = Peripherals::take().unwrap();
 
     // Set system frequency to 16MHz * 15/1/2 = 120MHz
     // This would lead to HrTim running at 120MHz * 32 = 3.84...
-    defmt::info!("rcc");
+    info!("rcc");
     let pwr = dp.PWR.constrain().freeze();
     let mut rcc = dp.RCC.freeze(
         rcc::Config::pll().pll_cfg(rcc::PllConfig {
@@ -43,7 +46,7 @@ fn main() -> ! {
         pwr,
     );
 
-    defmt::info!("Setup Gpio");
+    info!("Setup Gpio");
     let gpioa = dp.GPIOA.split(&mut rcc);
     let gpiob = dp.GPIOB.split(&mut rcc);
 
@@ -106,7 +109,7 @@ fn main() -> ! {
     capture.enable_interrupt(true, &mut hr_control);
     capture.add_event(&eev_input6);
 
-    defmt::info!("Setup DMA");
+    info!("Setup DMA");
     let channels = dp.DMA1.split(&rcc);
     let config = DmaConfig::default()
         .transfer_complete_interrupt(false)
@@ -129,7 +132,7 @@ fn main() -> ! {
             transfer.read_exact(&mut data);
             let [t1, t2] = data.map(|x| capture::dma_value_to_signed(x, period));
             cr1.set_duty(duty as u16);
-            defmt::info!("Capture: t1: {}, t2: {}, duty: {}, ", t1, t2, old_duty);
+            info!("Capture: t1: {}, t2: {}, duty: {}, ", t1, t2, old_duty);
             old_duty = duty;
         }
     }
diff --git a/examples/hrtim/capture.rs b/examples/hrtim/capture.rs
@@ -1,9 +1,12 @@
 #![no_std]
 #![no_main]
 
+#[path = "../utils/mod.rs"]
+mod utils;
+use utils::logger::info;
+
 /// Example showcasing the use of the HRTIM peripheral's capture function to detect phase shift between a digital event and the output of HRTIM_TIMA
 use cortex_m_rt::entry;
-use panic_probe as _;
 use stm32_hrtim::{
     capture::HrCapture,
     compare_register::HrCompareRegister,
@@ -22,13 +25,13 @@ use stm32g4xx_hal::{
 
 #[entry]
 fn main() -> ! {
-    defmt::info!("start");
+    info!("start");
 
     let dp = Peripherals::take().unwrap();
 
     // Set system frequency to 16MHz * 15/1/2 = 120MHz
     // This would lead to HrTim running at 120MHz * 32 = 3.84...
-    defmt::info!("rcc");
+    info!("rcc");
     let pwr = dp.PWR.constrain().freeze();
     let mut rcc = dp.RCC.freeze(
         rcc::Config::pll().pll_cfg(rcc::PllConfig {
@@ -42,7 +45,7 @@ fn main() -> ! {
         pwr,
     );
 
-    defmt::info!("Setup Gpio");
+    info!("Setup Gpio");
     let gpioa = dp.GPIOA.split(&mut rcc);
     let gpiob = dp.GPIOB.split(&mut rcc);
 
@@ -102,7 +105,7 @@ fn main() -> ! {
     loop {
         for duty in (u32::from(period) / 10)..(9 * u32::from(period) / 10) {
             if let Some(value) = capture.get_signed(period) {
-                defmt::info!(
+                info!(
                     "Capture: {:?}, duty: {}, diff: {}",
                     value,
                     old_duty,
diff --git a/examples/hrtim/eev-comp.rs b/examples/hrtim/eev-comp.rs
@@ -1,10 +1,13 @@
 #![no_std]
 #![no_main]
 
+#[path = "../utils/mod.rs"]
+mod utils;
+use utils::logger::info;
+
 /// Example showcasing the use of the HRTIM peripheral together with a comparator to implement a cycle by cycle current limit.
 /// Once the comparator input exceeds the reference set by the DAC, the output is set low thus limiting the pulse width and in turn the current.
 use cortex_m_rt::entry;
-use panic_probe as _;
 use stm32_hrtim::{
     compare_register::HrCompareRegister,
     external_event::{self, ToExternalEventSource},
@@ -124,10 +127,10 @@ fn main() -> ! {
     out.enable();
     timer.start(&mut hr_control.control);
 
-    defmt::info!("Started");
+    info!("Started");
 
     loop {
-        defmt::info!(
+        info!(
             "Comp: {}, pending: {}",
             comp1.output(),
             comp1.is_pending(&exti)
diff --git a/examples/hrtim/eev.rs b/examples/hrtim/eev.rs
@@ -1,10 +1,13 @@
 #![no_std]
 #![no_main]
 
+#[path = "../utils/mod.rs"]
+mod utils;
+use utils::logger::info;
+
 /// Example showcasing the use of the HRTIM peripheral together with a digital input to implement a cycle by cycle current limit.
 /// Once the digital input goes high, the output is set low thus limiting the pulse width and in turn the current.
 use cortex_m_rt::entry;
-use panic_probe as _;
 use stm32_hrtim::{
     compare_register::HrCompareRegister,
     external_event::{self, ToExternalEventSource},
@@ -96,7 +99,7 @@ fn main() -> ! {
     out.enable();
     timer.start(&mut hr_control.control);
 
-    defmt::info!("Started");
+    info!("Started");
 
     loop {
         cortex_m::asm::nop()
diff --git a/examples/hrtim/flt-comp.rs b/examples/hrtim/flt-comp.rs
@@ -1,11 +1,14 @@
 #![no_std]
 #![no_main]
 
+#[path = "../utils/mod.rs"]
+mod utils;
+use utils::logger::info;
+
 /// Example showcasing the use of the HRTIM peripheral together with a comparator to implement a current fault.
 /// Once the comparator input exceeds the reference set by the DAC, the output is forced low and put into a fault state.
 use cortex_m_rt::entry;
 use fugit::ExtU32 as _;
-use panic_probe as _;
 use stm32_hrtim::{
     compare_register::HrCompareRegister,
     fault::{FaultAction, FaultMonitor},
@@ -127,12 +130,12 @@ fn main() -> ! {
     out1.enable();
     timer.start(&mut hr_control.control);
 
-    defmt::info!("Started");
+    info!("Started");
 
     loop {
         for _ in 0..5 {
             delay.delay(500_u32.millis());
-            defmt::info!(
+            info!(
                 "State: {:?}, comp: {}, is_fault_active: _, pc1: {}",
                 out1.get_state(),
                 //comp3.output(), TODO
@@ -143,7 +146,7 @@ fn main() -> ! {
         if hr_control.fault_5.is_fault_active() {
             hr_control.fault_5.clear_fault(); // Clear fault every 5s
             out1.enable();
-            defmt::info!("failt cleared, and output reenabled");
+            info!("failt cleared, and output reenabled");
         }
     }
 }
diff --git a/examples/hrtim/flt.rs b/examples/hrtim/flt.rs
@@ -1,10 +1,13 @@
 #![no_std]
 #![no_main]
 
+#[path = "../utils/mod.rs"]
+mod utils;
+use utils::logger::info;
+
 /// Example showcasing the use of the HRTIM peripheral together with a comparator to implement a current fault.
 /// Once the digital input goes high, the output is forced low and put into a fault state.
 use cortex_m_rt::entry;
-use panic_probe as _;
 use stm32_hrtim::{
     compare_register::HrCompareRegister,
     fault::{FaultAction, FaultMonitor},
@@ -96,17 +99,17 @@ fn main() -> ! {
     out.enable();
     timer.start(&mut hr_control.control);
 
-    defmt::info!("Started");
+    info!("Started");
 
     loop {
         for _ in 0..5 {
             delay.delay(500_u32.millis());
-            defmt::info!("State: {:?}", out.get_state());
+            info!("State: {:?}", out.get_state());
         }
         if hr_control.fault_3.is_fault_active() {
             hr_control.fault_3.clear_fault(); // Clear fault every 5s
             out.enable();
-            defmt::info!("failt cleared, and output reenabled");
+            info!("failt cleared, and output reenabled");
         }
     }
 }
diff --git a/examples/hrtim/hrtim.rs b/examples/hrtim/hrtim.rs
@@ -3,9 +3,9 @@
 
 #[path = "../utils/mod.rs"]
 mod utils;
+use utils::logger::info;
 
 use cortex_m_rt::entry;
-use panic_probe as _;
 use stm32_hrtim::{
     compare_register::HrCompareRegister, output::HrOutput, timer::HrTimer, HrParts, HrPwmAdvExt,
     Pscl4,
@@ -22,7 +22,7 @@ use stm32g4xx_hal::{
 
 #[entry]
 fn main() -> ! {
-    defmt::info!("Initializing...");
+    info!("Initializing...");
 
     let dp = Peripherals::take().expect("cannot take peripherals");
     let cp = CorePeripherals::take().expect("cannot take core");
diff --git a/examples/hrtim/master.rs b/examples/hrtim/master.rs
@@ -1,8 +1,11 @@
 #![no_std]
 #![no_main]
 
+#[path = "../utils/mod.rs"]
+mod utils;
+use utils::logger::info;
+
 use cortex_m_rt::entry;
-use panic_probe as _;
 use stm32_hrtim::{
     compare_register::HrCompareRegister,
     output::HrOutput,
@@ -107,7 +110,7 @@ fn main() -> ! {
     mtimer.start(&mut hr_control.control);
     timer.start(&mut hr_control.control);
 
-    defmt::info!("Running");
+    info!("Running");
 
     loop {
         // Step frequency from 15kHz to about 146kHz(half of that when only looking at one pin)
@@ -119,7 +122,7 @@ fn main() -> ! {
             mtimer.set_period(new_period);
             timer.set_period(new_period - 1000);
 
-            defmt::info!(
+            info!(
                 "period: {}, duty: {}, get_duty: {}, get_period: {}",
                 new_period,
                 new_period / 3,
