Fix tests

Author: usbalbin

tests/nucleo-g474.rs

@@ -1,5 +1,6 @@
 #![no_std]
 #![no_main]
+#![allow(clippy::uninlined_format_args)]
 
 #[path = "../examples/utils/mod.rs"]
 mod utils;
@@ -49,7 +50,6 @@ mod tests {
         let dp = stm32::Peripherals::take().unwrap();
         let mut rcc = dp.RCC.constrain();
         let mut delay = cp.SYST.delay(&rcc.clocks);
-        defmt::dbg!(rcc.clocks.sys_clk);
 
         let gpioa = dp.GPIOA.split(&mut rcc);
         let _pa1_important_dont_use_as_output = gpioa.pa1.into_floating_input();
@@ -132,19 +132,13 @@ mod tests {
             hi_duration = await_lo(&timer, pin_num, max).unwrap();
             assert!(
                 hi_duration > min && hi_duration < max,
-                "hi: {} < {} < {}",
-                min,
-                hi_duration,
-                max
+                "hi: {min} < {hi_duration} < {max}"
             );
 
             lo_duration = await_hi(&timer, pin_num, max).unwrap();
             assert!(
                 lo_duration > min && lo_duration < max,
-                "lo: {} < {} < {}",
-                min,
-                lo_duration,
-                max
+                "lo: {min} < {lo_duration} < {max}"
             );
         }
 
@@ -231,7 +225,7 @@ mod tests {
             adc::config::Resolution::Twelve,
         );
         debug!("temp: {}°C", temp);
-        assert!((20.0..35.0).contains(&temp), "20.0 < {} < 35.0", temp);
+        assert!((20.0..35.0).contains(&temp), "20.0 < {temp} < 35.0");
     }
 
     #[test]
@@ -265,7 +259,7 @@ mod tests {
         adc.configure_channel(&Vref, adc::config::Sequence::One, sample_time);
         adc.configure_channel(&Temperature, adc::config::Sequence::Two, sample_time);
 
-        defmt::info!("Setup DMA");
+        debug!("Setup DMA");
         let first_buffer = cortex_m::singleton!(: [u16; 2] = [0; 2]).unwrap();
         let mut transfer = channels.ch1.into_peripheral_to_memory_transfer(
             adc.enable_dma(adc::config::Dma::Single),
@@ -275,9 +269,9 @@ mod tests {
 
         transfer.start(|adc| adc.start_conversion());
 
-        defmt::info!("Wait for Conversion");
+        debug!("Wait for Conversion");
         while !transfer.get_transfer_complete_flag() {}
-        defmt::info!("Conversion Done");
+        debug!("Conversion Done");
 
         transfer.pause(|adc| adc.cancel_conversion());
         let (_ch1, adc, first_buffer) = transfer.free();
@@ -302,6 +296,6 @@ mod tests {
             adc::config::Resolution::Twelve,
         );
         debug!("temp: {}°C", temp);
-        assert!((20.0..35.0).contains(&temp), "20.0 < {} < 35.0", temp);
+        assert!((20.0..35.0).contains(&temp), "20.0 < {temp} < 35.0");
     }
 }

tests/nucleo-g474_w_jumpers.rs

@@ -1,11 +1,14 @@
 #![no_std]
 #![no_main]
+#![allow(clippy::uninlined_format_args)]
 
 // Requires a jumper from A1<->A2 (arduino naming) aka PA1<->PA4
 
 #[path = "../examples/utils/mod.rs"]
 mod utils;
 
+use utils::logger::println;
+
 mod common;
 
 use stm32g4xx_hal::adc::{self, AdcClaim, AdcCommonExt};
@@ -83,9 +86,7 @@ mod tests {
             let reading = adc.convert(&opamp, sample_time);
             assert!(
                 reading.abs_diff(setpoint) < 10,
-                "reading: {}, setpoint {}",
-                reading,
-                setpoint
+                "reading: {reading}, setpoint {setpoint}"
             );
         }
     }
@@ -114,9 +115,7 @@ mod tests {
             let reading = adc.convert(&pa2, sample_time);
             assert!(
                 reading.abs_diff(setpoint) < 10,
-                "reading: {}, setpoint {}",
-                reading,
-                setpoint
+                "reading: {reading}, setpoint {setpoint}"
             );
         }
     }
@@ -141,9 +140,7 @@ mod tests {
             let reading = adc.convert(&opamp, sample_time);
             assert!(
                 reading.abs_diff((setpoint * 2).min(4095)) < 20,
-                "reading: {}, setpoint {}",
-                reading,
-                setpoint
+                "reading: {reading}, setpoint {setpoint}"
             );
         }
     }
@@ -180,8 +177,7 @@ mod tests {
             let out = comp.output();
             assert!(
                 comp.output() == (value_setpoint > ref_setpoint),
-                "setpoint: {}, expected: '{}', got '{}'",
-                value_setpoint,
+                "setpoint: {value_setpoint}, expected: '{}', got '{}'",
                 if value_setpoint > ref_setpoint {
                     "HI"
                 } else {
@@ -224,8 +220,7 @@ mod tests {
             let out = comp.output();
             assert!(
                 comp.output() == (value_setpoint > ref_setpoint),
-                "setpoint: {}, expected: '{}', got '{}'",
-                value_setpoint,
+                "setpoint: {value_setpoint}, expected: '{}', got '{}'",
                 if value_setpoint > ref_setpoint {
                     "HI"
                 } else {
@@ -246,6 +241,7 @@ mod tests {
     ///
     #[test]
     fn comp_dac_dac() {
+        use super::*;
         let super::Peripherals {
             comp,
             mut value_dac,
@@ -264,7 +260,7 @@ mod tests {
         for s_ref in 4..=255 {
             let s_ref = s_ref << 4; // Convert from 8 to 12 bits
             if s_ref & 0xFF == 0 {
-                defmt::println!("{}/{}...", s_ref, 4095);
+                println!("{}/4095...", s_ref);
             }
             ref_dac.set_value(s_ref);
             for s_value in 0..=255 {
@@ -275,10 +271,7 @@ mod tests {
                 if s_value.abs_diff(s_ref) > 20 {
                     assert!(
                         out == (s_value > s_ref),
-                        "s_value: {}, s_ref: {}, out: {}",
-                        s_value,
-                        s_ref,
-                        out
+                        "s_value: {s_value}, s_ref: {s_ref}, out: {out}"
                     );
                 }
             }