Skip to content

Commit aafb88b

Browse files
committed
rebase + cleanup
1 parent 74718ee commit aafb88b

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

hil-test/tests/embassy_timers_executors.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,18 @@
88
#![no_main]
99

1010
use embassy_time::{Duration, Ticker, Timer};
11-
use esp_hal::{
12-
interrupt::software::SoftwareInterruptControl,
13-
peripherals::Peripherals,
14-
prelude::*,
15-
timer::{timg::TimerGroup, OneShotTimer, PeriodicTimer},
16-
};
1711
#[cfg(not(feature = "esp32"))]
1812
use esp_hal::{
1913
interrupt::software::SoftwareInterruptControl,
2014
interrupt::Priority,
2115
timer::systimer::{Alarm, FrozenUnit, Periodic, SystemTimer, Target},
2216
timer::ErasedTimer,
2317
};
18+
use esp_hal::{
19+
peripherals::Peripherals,
20+
prelude::*,
21+
timer::{timg::TimerGroup, OneShotTimer, PeriodicTimer},
22+
};
2423
#[cfg(not(feature = "esp32"))]
2524
use esp_hal_embassy::InterruptExecutor;
2625
use hil_test as _;

hil-test/tests/spi_full_duplex.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ mod tests {
4040
let sclk = io.pins.gpio0;
4141
let (miso, mosi) = hil_test::common_test_pins!(io);
4242

43-
let spi = Spi::new(peripherals.SPI2, 1000u32.kHz(), SpiMode::Mode0, &clocks)
43+
let spi = Spi::new(peripherals.SPI2, 1000u32.kHz(), SpiMode::Mode0)
4444
.with_sck(sclk)
4545
.with_mosi(mosi)
4646
.with_miso(miso);

hil-test/tests/spi_full_duplex_dma.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ mod tests {
6767
}
6868
}
6969

70-
let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0, &clocks)
70+
let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0)
7171
.with_sck(sclk)
7272
.with_mosi(mosi)
7373
.with_miso(miso)

hil-test/tests/spi_full_duplex_dma_async.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ mod tests {
9898
let dma_tx_buf = DmaTxBuf::new(tx_descriptors, tx_buffer).unwrap();
9999
let dma_rx_buf = DmaRxBuf::new(rx_descriptors, rx_buffer).unwrap();
100100

101-
let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0, &clocks)
101+
let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0)
102102
.with_sck(sclk)
103103
.with_mosi(mosi)
104104
.with_miso(miso)

hil-test/tests/spi_full_duplex_dma_pcnt.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ mod tests {
8080
}
8181
}
8282

83-
let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0, &clocks)
83+
let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0)
8484
.with_sck(sclk)
8585
.with_mosi(mosi)
8686
.with_miso(miso)

0 commit comments

Comments
 (0)