rebase + cleanup

Author: JurajSadel

hil-test/tests/aes_dma.rs

@@ -14,7 +14,7 @@ use esp_hal::{
     dma::{Dma, DmaPriority},
     dma_buffers,
     peripherals::Peripherals,
-    prelude::*,
+    // prelude::*,
 };
 use hil_test as _;
 

hil-test/tests/delay.rs

@@ -20,7 +20,7 @@ mod tests {
 
     #[init]
     fn init() -> Context {
-        let peripherals = esp_hal::init(esp_hal::Config::default());
+        // let peripherals = esp_hal::init(esp_hal::Config::default());
         let delay = Delay::new();
 
         Context { delay }

hil-test/tests/embassy_timers_executors.rs

@@ -8,19 +8,18 @@
 #![no_main]
 
 use embassy_time::{Duration, Ticker, Timer};
-use esp_hal::{
-    interrupt::software::SoftwareInterruptControl,
-    peripherals::Peripherals,
-    prelude::*,
-    timer::{timg::TimerGroup, OneShotTimer, PeriodicTimer},
-};
 #[cfg(not(feature = "esp32"))]
 use esp_hal::{
     interrupt::software::SoftwareInterruptControl,
     interrupt::Priority,
     timer::systimer::{Alarm, FrozenUnit, Periodic, SystemTimer, Target},
     timer::ErasedTimer,
 };
+use esp_hal::{
+    peripherals::Peripherals,
+    prelude::*,
+    timer::{timg::TimerGroup, OneShotTimer, PeriodicTimer},
+};
 #[cfg(not(feature = "esp32"))]
 use esp_hal_embassy::InterruptExecutor;
 use hil_test as _;

hil-test/tests/get_time.rs

@@ -61,7 +61,7 @@ mod tests {
     #[test]
     #[timeout(3)]
     fn test_current_time_construct_timg0(ctx: Context) {
-        time_moves_forward_during(ctx, |ctx| {
+        time_moves_forward_during(ctx, |_| {
             // construct the timer in between calls to current_time
             let _ = esp_hal::timer::timg::TimerGroup::new(unsafe {
                 esp_hal::peripherals::TIMG0::steal()

hil-test/tests/spi_full_duplex.rs

@@ -40,7 +40,7 @@ mod tests {
         let sclk = io.pins.gpio0;
         let (miso, mosi) = hil_test::common_test_pins!(io);
 
-        let spi = Spi::new(peripherals.SPI2, 1000u32.kHz(), SpiMode::Mode0, &clocks)
+        let spi = Spi::new(peripherals.SPI2, 1000u32.kHz(), SpiMode::Mode0)
             .with_sck(sclk)
             .with_mosi(mosi)
             .with_miso(miso);

hil-test/tests/spi_full_duplex_dma.rs

@@ -67,7 +67,7 @@ mod tests {
             }
         }
 
-        let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0, &clocks)
+        let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0)
             .with_sck(sclk)
             .with_mosi(mosi)
             .with_miso(miso)

hil-test/tests/spi_full_duplex_dma_async.rs

@@ -97,7 +97,7 @@ mod tests {
         let dma_tx_buf = DmaTxBuf::new(tx_descriptors, tx_buffer).unwrap();
         let dma_rx_buf = DmaRxBuf::new(rx_descriptors, rx_buffer).unwrap();
 
-        let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0, &clocks)
+        let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0)
             .with_sck(sclk)
             .with_mosi(mosi)
             .with_miso(miso)

hil-test/tests/spi_full_duplex_dma_pcnt.rs

@@ -80,7 +80,7 @@ mod tests {
             }
         }
 
-        let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0, &clocks)
+        let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0)
             .with_sck(sclk)
             .with_mosi(mosi)
             .with_miso(miso)