diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f0e59d39a9..f141356ea9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,6 +67,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - The `WithDmaSpi2`/`WithDmaSpi3` structs are no longer generic around the inner peripheral type (#853) - The `SarAdcExt`/`SensExt` traits are now collectively named `AnalogExt` instead (#857) - Replace the `radio` module with peripheral singleton structs (#852) +- The SPI traits are no longer re-exported in the main prelude, but from preludes in `spi::master`/`spi::slave` instead (#860) +- The `embedded-hal-1` and `embedded-hal-async` traits are no longer re-exported in the prelude (#860) ## [0.12.0] diff --git a/esp-hal-common/src/prelude.rs b/esp-hal-common/src/prelude.rs index 16784394578..83bef8e7ea7 100644 --- a/esp-hal-common/src/prelude.rs +++ b/esp-hal-common/src/prelude.rs @@ -19,14 +19,6 @@ pub use embedded_hal::{ }, prelude::*, }; -#[cfg(feature = "async")] -pub use embedded_hal_async::{ - delay::DelayUs as _embedded_hal_async_delay_DelayUs, - digital::Wait as _embedded_hal_async_digital_Wait, - i2c::I2c as _embedded_hal_async_i2c_I2c, - spi::SpiBus as _embedded_hal_async_spi_SpiBus, - spi::SpiDevice as _embedded_hal_async_spi_SpiDevice, -}; pub use fugit::{ ExtU32 as _fugit_ExtU32, ExtU64 as _fugit_ExtU64, @@ -58,20 +50,6 @@ pub use crate::ledc::{ }, timer::{TimerHW as _esp_hal_ledc_timer_TimerHW, TimerIFace as _esp_hal_ledc_timer_TimerIFace}, }; -#[cfg(spi3)] -pub use crate::spi::master::dma::WithDmaSpi3 as _esp_hal_spi_dma_WithDmaSpi3; -#[cfg(any(spi0, spi1, spi2, spi3))] -pub use crate::spi::master::{ - dma::WithDmaSpi2 as _esp_hal_spi_dma_WithDmaSpi2, - Instance as _esp_hal_spi_Instance, - InstanceDma as _esp_hal_spi_InstanceDma, -}; -#[cfg(all(any(spi0, spi1, spi2, spi3), not(pdma)))] -pub use crate::spi::slave::{ - dma::WithDmaSpi2 as _esp_hal_spi_slave_dma_WithDmaSpi2, - Instance as _esp_hal_spi_slave_Instance, - InstanceDma as _esp_hal_spi_slave_InstanceDma, -}; #[cfg(any(dport, pcr, system))] pub use crate::system::SystemExt as _esp_hal_system_SystemExt; #[cfg(any(timg0, timg1))] @@ -82,32 +60,3 @@ pub use crate::timer::{ #[cfg(any(uart0, uart1, uart2))] pub use crate::uart::{Instance as _esp_hal_uart_Instance, UartPins as _esp_hal_uart_UartPins}; pub use crate::{clock::Clock as _esp_hal_clock_Clock, entry, macros::*}; - -/// All traits required for using the 1.0.0-alpha.x release of embedded-hal -#[cfg(feature = "eh1")] -pub mod eh1 { - #[cfg(any(twai0, twai1))] - pub use embedded_can::{ - blocking::Can as _embedded_can_blocking_Can, - nb::Can as _embedded_can_nb_Can, - Error as _embedded_can_Error, - Frame as _embedded_can_Frame, - }; - pub use embedded_hal_1::{ - delay::DelayUs as _embedded_hal_1_delay_DelayUs, - digital::{ - InputPin as _embedded_hal_1_digital_InputPin, - OutputPin as _embedded_hal_1_digital_OutputPin, - StatefulOutputPin as _embedded_hal_1_digital_StatefulOutputPin, - ToggleableOutputPin as _embedded_hal_1_digital_ToggleableOutputPin, - }, - i2c::I2c as _embedded_hal_1_i2c_I2c, - spi::{SpiBus as _embedded_hal_1_spi_SpiBus, SpiDevice as _embedded_hal_1_spi_SpiDevice}, - }; - pub use embedded_hal_nb::{ - serial::{Read as _embedded_hal_nb_serial_Read, Write as _embedded_hal_nb_serial_Write}, - spi::FullDuplex as _embedded_hal_nb_spi_FullDuplex, - }; - - pub use super::*; -} diff --git a/esp-hal-common/src/spi/master.rs b/esp-hal-common/src/spi/master.rs index 176d5b372ed..30ca2fbc4a4 100644 --- a/esp-hal-common/src/spi/master.rs +++ b/esp-hal-common/src/spi/master.rs @@ -73,6 +73,17 @@ use crate::{ system::PeripheralClockControl, }; +/// Prelude for the SPI (Master) driver +pub mod prelude { + #[cfg(spi3)] + pub use super::dma::WithDmaSpi3 as _esp_hal_spi_master_dma_WithDmaSpi3; + pub use super::{ + dma::WithDmaSpi2 as _esp_hal_spi_master_dma_WithDmaSpi2, + Instance as _esp_hal_spi_master_Instance, + InstanceDma as _esp_hal_spi_master_InstanceDma, + }; +} + /// The size of the FIFO buffer for SPI #[cfg(not(esp32s2))] const FIFO_SIZE: usize = 64; diff --git a/esp-hal-common/src/spi/slave.rs b/esp-hal-common/src/spi/slave.rs index f263a5f873e..a9ee52c98bb 100644 --- a/esp-hal-common/src/spi/slave.rs +++ b/esp-hal-common/src/spi/slave.rs @@ -68,6 +68,17 @@ use crate::{ system::PeripheralClockControl, }; +/// Prelude for the SPI (Slave) driver +pub mod prelude { + #[cfg(spi3)] + pub use super::dma::WithDmaSpi3 as _esp_hal_spi_slave_dma_WithDmaSpi3; + pub use super::{ + dma::WithDmaSpi2 as _esp_hal_spi_slave_dma_WithDmaSpi2, + Instance as _esp_hal_spi_slave_Instance, + InstanceDma as _esp_hal_spi_slave_InstanceDma, + }; +} + const MAX_DMA_SIZE: usize = 32768 - 32; /// SPI peripheral driver diff --git a/esp32-hal/examples/embassy_spi.rs b/esp32-hal/examples/embassy_spi.rs index eb8a6b8c642..087331b2c04 100644 --- a/esp32-hal/examples/embassy_spi.rs +++ b/esp32-hal/examples/embassy_spi.rs @@ -27,7 +27,10 @@ use esp32_hal::{ pdma::*, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, timer::TimerGroup, IO, }; diff --git a/esp32-hal/examples/qspi_flash.rs b/esp32-hal/examples/qspi_flash.rs index 4df7e947ea4..b12240d83ec 100644 --- a/esp32-hal/examples/qspi_flash.rs +++ b/esp32-hal/examples/qspi_flash.rs @@ -25,7 +25,7 @@ use esp32_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Address, Command, Spi}, + master::{prelude::*, Address, Command, Spi}, SpiDataMode, SpiMode, }, diff --git a/esp32-hal/examples/spi_eh1_device_loopback.rs b/esp32-hal/examples/spi_eh1_device_loopback.rs index 1faf27ebdec..c60dae080ac 100644 --- a/esp32-hal/examples/spi_eh1_device_loopback.rs +++ b/esp32-hal/examples/spi_eh1_device_loopback.rs @@ -25,7 +25,7 @@ use esp32_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Spi, SpiBusController}, + master::{prelude::*, Spi, SpiBusController}, SpiMode, }, Delay, diff --git a/esp32-hal/examples/spi_eh1_loopback.rs b/esp32-hal/examples/spi_eh1_loopback.rs index d73499db84c..261fffab64e 100644 --- a/esp32-hal/examples/spi_eh1_loopback.rs +++ b/esp32-hal/examples/spi_eh1_loopback.rs @@ -22,7 +22,10 @@ use esp32_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32-hal/examples/spi_halfduplex_read_manufacturer_id.rs b/esp32-hal/examples/spi_halfduplex_read_manufacturer_id.rs index cbaabfc8947..87abd3fed51 100644 --- a/esp32-hal/examples/spi_halfduplex_read_manufacturer_id.rs +++ b/esp32-hal/examples/spi_halfduplex_read_manufacturer_id.rs @@ -23,7 +23,7 @@ use esp32_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Address, Command, HalfDuplexReadWrite, Spi}, + master::{prelude::*, Address, Command, HalfDuplexReadWrite, Spi}, SpiDataMode, SpiMode, }, diff --git a/esp32-hal/examples/spi_loopback.rs b/esp32-hal/examples/spi_loopback.rs index 2ef6aec974a..8c978c63a14 100644 --- a/esp32-hal/examples/spi_loopback.rs +++ b/esp32-hal/examples/spi_loopback.rs @@ -21,7 +21,10 @@ use esp32_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32-hal/examples/spi_loopback_dma.rs b/esp32-hal/examples/spi_loopback_dma.rs index 6b3bc83cad1..3e55b295804 100644 --- a/esp32-hal/examples/spi_loopback_dma.rs +++ b/esp32-hal/examples/spi_loopback_dma.rs @@ -23,7 +23,10 @@ use esp32_hal::{ pdma::Dma, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32c2-hal/examples/embassy_spi.rs b/esp32c2-hal/examples/embassy_spi.rs index 79cf1f71731..83db0d634d7 100644 --- a/esp32c2-hal/examples/embassy_spi.rs +++ b/esp32c2-hal/examples/embassy_spi.rs @@ -27,7 +27,10 @@ use esp32c2_hal::{ gdma::*, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, IO, }; use esp_backtrace as _; diff --git a/esp32c2-hal/examples/qspi_flash.rs b/esp32c2-hal/examples/qspi_flash.rs index 4b7c64b162c..5d7d8cc637f 100644 --- a/esp32c2-hal/examples/qspi_flash.rs +++ b/esp32c2-hal/examples/qspi_flash.rs @@ -25,7 +25,7 @@ use esp32c2_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Address, Command, Spi}, + master::{prelude::*, Address, Command, Spi}, SpiDataMode, SpiMode, }, diff --git a/esp32c2-hal/examples/spi_eh1_device_loopback.rs b/esp32c2-hal/examples/spi_eh1_device_loopback.rs index 857c97b187a..213f29b7a3e 100644 --- a/esp32c2-hal/examples/spi_eh1_device_loopback.rs +++ b/esp32c2-hal/examples/spi_eh1_device_loopback.rs @@ -25,7 +25,7 @@ use esp32c2_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Spi, SpiBusController}, + master::{prelude::*, Spi, SpiBusController}, SpiMode, }, Delay, diff --git a/esp32c2-hal/examples/spi_eh1_loopback.rs b/esp32c2-hal/examples/spi_eh1_loopback.rs index ef478e8bce1..d857cb68dbb 100644 --- a/esp32c2-hal/examples/spi_eh1_loopback.rs +++ b/esp32c2-hal/examples/spi_eh1_loopback.rs @@ -22,7 +22,10 @@ use esp32c2_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32c2-hal/examples/spi_halfduplex_read_manufacturer_id.rs b/esp32c2-hal/examples/spi_halfduplex_read_manufacturer_id.rs index 99bdde01d7a..2b4b7308197 100644 --- a/esp32c2-hal/examples/spi_halfduplex_read_manufacturer_id.rs +++ b/esp32c2-hal/examples/spi_halfduplex_read_manufacturer_id.rs @@ -23,7 +23,7 @@ use esp32c2_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Address, Command, HalfDuplexReadWrite, Spi}, + master::{prelude::*, Address, Command, HalfDuplexReadWrite, Spi}, SpiDataMode, SpiMode, }, diff --git a/esp32c2-hal/examples/spi_loopback.rs b/esp32c2-hal/examples/spi_loopback.rs index 65b622e407d..fce0fefd11b 100644 --- a/esp32c2-hal/examples/spi_loopback.rs +++ b/esp32c2-hal/examples/spi_loopback.rs @@ -21,7 +21,10 @@ use esp32c2_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32c2-hal/examples/spi_loopback_dma.rs b/esp32c2-hal/examples/spi_loopback_dma.rs index 4487a204ca6..83607c4f7a1 100644 --- a/esp32c2-hal/examples/spi_loopback_dma.rs +++ b/esp32c2-hal/examples/spi_loopback_dma.rs @@ -23,7 +23,10 @@ use esp32c2_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32c2-hal/examples/spi_slave_dma.rs b/esp32c2-hal/examples/spi_slave_dma.rs index 2ea4ba03d24..7e24d0c99ee 100644 --- a/esp32c2-hal/examples/spi_slave_dma.rs +++ b/esp32c2-hal/examples/spi_slave_dma.rs @@ -32,7 +32,10 @@ use esp32c2_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{slave::Spi, SpiMode}, + spi::{ + slave::{prelude::*, Spi}, + SpiMode, + }, timer::TimerGroup, Delay, Rtc, diff --git a/esp32c3-hal/examples/embassy_spi.rs b/esp32c3-hal/examples/embassy_spi.rs index 2a975a07c3b..f1b98c8e5be 100644 --- a/esp32c3-hal/examples/embassy_spi.rs +++ b/esp32c3-hal/examples/embassy_spi.rs @@ -27,7 +27,10 @@ use esp32c3_hal::{ gdma::*, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, IO, }; use esp_backtrace as _; diff --git a/esp32c3-hal/examples/qspi_flash.rs b/esp32c3-hal/examples/qspi_flash.rs index 3bc1f80b861..d23938e7063 100644 --- a/esp32c3-hal/examples/qspi_flash.rs +++ b/esp32c3-hal/examples/qspi_flash.rs @@ -25,7 +25,7 @@ use esp32c3_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Address, Command, Spi}, + master::{prelude::*, Address, Command, Spi}, SpiDataMode, SpiMode, }, diff --git a/esp32c3-hal/examples/spi_eh1_device_loopback.rs b/esp32c3-hal/examples/spi_eh1_device_loopback.rs index 60ed2dbf885..7c210e8556e 100644 --- a/esp32c3-hal/examples/spi_eh1_device_loopback.rs +++ b/esp32c3-hal/examples/spi_eh1_device_loopback.rs @@ -25,7 +25,7 @@ use esp32c3_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Spi, SpiBusController}, + master::{prelude::*, Spi, SpiBusController}, SpiMode, }, Delay, diff --git a/esp32c3-hal/examples/spi_eh1_loopback.rs b/esp32c3-hal/examples/spi_eh1_loopback.rs index 07099376ac5..46d4e1fb115 100644 --- a/esp32c3-hal/examples/spi_eh1_loopback.rs +++ b/esp32c3-hal/examples/spi_eh1_loopback.rs @@ -22,7 +22,10 @@ use esp32c3_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32c3-hal/examples/spi_halfduplex_read_manufacturer_id.rs b/esp32c3-hal/examples/spi_halfduplex_read_manufacturer_id.rs index afe332de41b..5e82f375dff 100644 --- a/esp32c3-hal/examples/spi_halfduplex_read_manufacturer_id.rs +++ b/esp32c3-hal/examples/spi_halfduplex_read_manufacturer_id.rs @@ -23,7 +23,7 @@ use esp32c3_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Address, Command, HalfDuplexReadWrite, Spi}, + master::{prelude::*, Address, Command, HalfDuplexReadWrite, Spi}, SpiDataMode, SpiMode, }, diff --git a/esp32c3-hal/examples/spi_loopback.rs b/esp32c3-hal/examples/spi_loopback.rs index 37632a7fc9f..f5b642b0141 100644 --- a/esp32c3-hal/examples/spi_loopback.rs +++ b/esp32c3-hal/examples/spi_loopback.rs @@ -21,7 +21,10 @@ use esp32c3_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32c3-hal/examples/spi_loopback_dma.rs b/esp32c3-hal/examples/spi_loopback_dma.rs index ed6a361bb33..2aa80cbdeb7 100644 --- a/esp32c3-hal/examples/spi_loopback_dma.rs +++ b/esp32c3-hal/examples/spi_loopback_dma.rs @@ -23,7 +23,10 @@ use esp32c3_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32c3-hal/examples/spi_slave_dma.rs b/esp32c3-hal/examples/spi_slave_dma.rs index 8373da61b1b..f525d3ca2bf 100644 --- a/esp32c3-hal/examples/spi_slave_dma.rs +++ b/esp32c3-hal/examples/spi_slave_dma.rs @@ -32,7 +32,10 @@ use esp32c3_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{slave::Spi, SpiMode}, + spi::{ + slave::{prelude::*, Spi}, + SpiMode, + }, timer::TimerGroup, Delay, Rtc, diff --git a/esp32c6-hal/examples/embassy_spi.rs b/esp32c6-hal/examples/embassy_spi.rs index 3ac09cd5d64..e097c9f0754 100644 --- a/esp32c6-hal/examples/embassy_spi.rs +++ b/esp32c6-hal/examples/embassy_spi.rs @@ -27,7 +27,10 @@ use esp32c6_hal::{ gdma::*, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, IO, }; use esp_backtrace as _; diff --git a/esp32c6-hal/examples/qspi_flash.rs b/esp32c6-hal/examples/qspi_flash.rs index e7d031bd25f..76daf1f88bc 100644 --- a/esp32c6-hal/examples/qspi_flash.rs +++ b/esp32c6-hal/examples/qspi_flash.rs @@ -25,7 +25,7 @@ use esp32c6_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Address, Command, Spi}, + master::{prelude::*, Address, Command, Spi}, SpiDataMode, SpiMode, }, diff --git a/esp32c6-hal/examples/spi_eh1_device_loopback.rs b/esp32c6-hal/examples/spi_eh1_device_loopback.rs index 60849c47538..5efe003599f 100644 --- a/esp32c6-hal/examples/spi_eh1_device_loopback.rs +++ b/esp32c6-hal/examples/spi_eh1_device_loopback.rs @@ -25,7 +25,7 @@ use esp32c6_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Spi, SpiBusController}, + master::{prelude::*, Spi, SpiBusController}, SpiMode, }, Delay, diff --git a/esp32c6-hal/examples/spi_eh1_loopback.rs b/esp32c6-hal/examples/spi_eh1_loopback.rs index 9c292e1338a..fbc124f443b 100644 --- a/esp32c6-hal/examples/spi_eh1_loopback.rs +++ b/esp32c6-hal/examples/spi_eh1_loopback.rs @@ -22,7 +22,10 @@ use esp32c6_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32c6-hal/examples/spi_halfduplex_read_manufacturer_id.rs b/esp32c6-hal/examples/spi_halfduplex_read_manufacturer_id.rs index 4577b5f1a7c..8ae8d14b802 100644 --- a/esp32c6-hal/examples/spi_halfduplex_read_manufacturer_id.rs +++ b/esp32c6-hal/examples/spi_halfduplex_read_manufacturer_id.rs @@ -23,7 +23,7 @@ use esp32c6_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Address, Command, HalfDuplexReadWrite, Spi}, + master::{prelude::*, Address, Command, HalfDuplexReadWrite, Spi}, SpiDataMode, SpiMode, }, diff --git a/esp32c6-hal/examples/spi_loopback.rs b/esp32c6-hal/examples/spi_loopback.rs index 43d6f63cc7e..943952cbd54 100644 --- a/esp32c6-hal/examples/spi_loopback.rs +++ b/esp32c6-hal/examples/spi_loopback.rs @@ -21,7 +21,10 @@ use esp32c6_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32c6-hal/examples/spi_loopback_dma.rs b/esp32c6-hal/examples/spi_loopback_dma.rs index 80f2571e39b..bdea1ff93db 100644 --- a/esp32c6-hal/examples/spi_loopback_dma.rs +++ b/esp32c6-hal/examples/spi_loopback_dma.rs @@ -23,7 +23,10 @@ use esp32c6_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32c6-hal/examples/spi_slave_dma.rs b/esp32c6-hal/examples/spi_slave_dma.rs index 7b7965b0499..6d74b7a7ab0 100644 --- a/esp32c6-hal/examples/spi_slave_dma.rs +++ b/esp32c6-hal/examples/spi_slave_dma.rs @@ -32,7 +32,10 @@ use esp32c6_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{slave::Spi, SpiMode}, + spi::{ + slave::{prelude::*, Spi}, + SpiMode, + }, timer::TimerGroup, Delay, Rtc, diff --git a/esp32h2-hal/examples/embassy_spi.rs b/esp32h2-hal/examples/embassy_spi.rs index ceaa9e22040..e07cab973b0 100644 --- a/esp32h2-hal/examples/embassy_spi.rs +++ b/esp32h2-hal/examples/embassy_spi.rs @@ -27,7 +27,10 @@ use esp32h2_hal::{ gdma::*, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, IO, }; use esp_backtrace as _; diff --git a/esp32h2-hal/examples/qspi_flash.rs b/esp32h2-hal/examples/qspi_flash.rs index 691e7c9e35b..8acc44d1d1e 100644 --- a/esp32h2-hal/examples/qspi_flash.rs +++ b/esp32h2-hal/examples/qspi_flash.rs @@ -25,7 +25,7 @@ use esp32h2_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Address, Command, Spi}, + master::{prelude::*, Address, Command, Spi}, SpiDataMode, SpiMode, }, diff --git a/esp32h2-hal/examples/spi_eh1_device_loopback.rs b/esp32h2-hal/examples/spi_eh1_device_loopback.rs index b88259e5cfd..07d58e67714 100644 --- a/esp32h2-hal/examples/spi_eh1_device_loopback.rs +++ b/esp32h2-hal/examples/spi_eh1_device_loopback.rs @@ -25,7 +25,7 @@ use esp32h2_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Spi, SpiBusController}, + master::{prelude::*, Spi, SpiBusController}, SpiMode, }, Delay, diff --git a/esp32h2-hal/examples/spi_eh1_loopback.rs b/esp32h2-hal/examples/spi_eh1_loopback.rs index 4c9f4f4594d..bb46f416746 100644 --- a/esp32h2-hal/examples/spi_eh1_loopback.rs +++ b/esp32h2-hal/examples/spi_eh1_loopback.rs @@ -22,7 +22,10 @@ use esp32h2_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32h2-hal/examples/spi_halfduplex_read_manufacturer_id.rs b/esp32h2-hal/examples/spi_halfduplex_read_manufacturer_id.rs index 801e9894551..ec03a5a1f30 100644 --- a/esp32h2-hal/examples/spi_halfduplex_read_manufacturer_id.rs +++ b/esp32h2-hal/examples/spi_halfduplex_read_manufacturer_id.rs @@ -23,7 +23,7 @@ use esp32h2_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Address, Command, HalfDuplexReadWrite, Spi}, + master::{prelude::*, Address, Command, HalfDuplexReadWrite, Spi}, SpiDataMode, SpiMode, }, diff --git a/esp32h2-hal/examples/spi_loopback.rs b/esp32h2-hal/examples/spi_loopback.rs index 62db30f4ac3..1f0c4988fc0 100644 --- a/esp32h2-hal/examples/spi_loopback.rs +++ b/esp32h2-hal/examples/spi_loopback.rs @@ -21,7 +21,10 @@ use esp32h2_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32h2-hal/examples/spi_loopback_dma.rs b/esp32h2-hal/examples/spi_loopback_dma.rs index 1b802b6ea41..989c79561eb 100644 --- a/esp32h2-hal/examples/spi_loopback_dma.rs +++ b/esp32h2-hal/examples/spi_loopback_dma.rs @@ -23,7 +23,10 @@ use esp32h2_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32h2-hal/examples/spi_slave_dma.rs b/esp32h2-hal/examples/spi_slave_dma.rs index 088078a856b..b1c05e9e4f5 100644 --- a/esp32h2-hal/examples/spi_slave_dma.rs +++ b/esp32h2-hal/examples/spi_slave_dma.rs @@ -32,7 +32,10 @@ use esp32h2_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{slave::Spi, SpiMode}, + spi::{ + slave::{prelude::*, Spi}, + SpiMode, + }, timer::TimerGroup, Delay, Rtc, diff --git a/esp32s2-hal/examples/embassy_spi.rs b/esp32s2-hal/examples/embassy_spi.rs index 8feb8a3fe29..ee06e95a910 100644 --- a/esp32s2-hal/examples/embassy_spi.rs +++ b/esp32s2-hal/examples/embassy_spi.rs @@ -27,7 +27,10 @@ use esp32s2_hal::{ pdma::*, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, IO, }; use esp_backtrace as _; diff --git a/esp32s2-hal/examples/qspi_flash.rs b/esp32s2-hal/examples/qspi_flash.rs index 292ffb9860e..e673118d3a5 100644 --- a/esp32s2-hal/examples/qspi_flash.rs +++ b/esp32s2-hal/examples/qspi_flash.rs @@ -25,7 +25,7 @@ use esp32s2_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Address, Command, Spi}, + master::{prelude::*, Address, Command, Spi}, SpiDataMode, SpiMode, }, diff --git a/esp32s2-hal/examples/spi_eh1_device_loopback.rs b/esp32s2-hal/examples/spi_eh1_device_loopback.rs index 5a319c3a849..3ad1171cb19 100644 --- a/esp32s2-hal/examples/spi_eh1_device_loopback.rs +++ b/esp32s2-hal/examples/spi_eh1_device_loopback.rs @@ -25,7 +25,7 @@ use esp32s2_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Spi, SpiBusController}, + master::{prelude::*, Spi, SpiBusController}, SpiMode, }, Delay, diff --git a/esp32s2-hal/examples/spi_eh1_loopback.rs b/esp32s2-hal/examples/spi_eh1_loopback.rs index fdfd14f25c7..532289b2f1e 100644 --- a/esp32s2-hal/examples/spi_eh1_loopback.rs +++ b/esp32s2-hal/examples/spi_eh1_loopback.rs @@ -22,7 +22,10 @@ use esp32s2_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32s2-hal/examples/spi_halfduplex_read_manufacturer_id.rs b/esp32s2-hal/examples/spi_halfduplex_read_manufacturer_id.rs index 9db5c87699d..865cef98d97 100644 --- a/esp32s2-hal/examples/spi_halfduplex_read_manufacturer_id.rs +++ b/esp32s2-hal/examples/spi_halfduplex_read_manufacturer_id.rs @@ -23,7 +23,7 @@ use esp32s2_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Address, Command, HalfDuplexReadWrite, Spi}, + master::{prelude::*, Address, Command, HalfDuplexReadWrite, Spi}, SpiDataMode, SpiMode, }, diff --git a/esp32s2-hal/examples/spi_loopback.rs b/esp32s2-hal/examples/spi_loopback.rs index db158ddb870..bd6d6f0937f 100644 --- a/esp32s2-hal/examples/spi_loopback.rs +++ b/esp32s2-hal/examples/spi_loopback.rs @@ -21,7 +21,10 @@ use esp32s2_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32s2-hal/examples/spi_loopback_dma.rs b/esp32s2-hal/examples/spi_loopback_dma.rs index c12ce5fb163..4cab550cb35 100644 --- a/esp32s2-hal/examples/spi_loopback_dma.rs +++ b/esp32s2-hal/examples/spi_loopback_dma.rs @@ -23,7 +23,10 @@ use esp32s2_hal::{ pdma::Dma, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32s3-hal/examples/embassy_spi.rs b/esp32s3-hal/examples/embassy_spi.rs index 21d1f1404cd..60dfc72f1e5 100644 --- a/esp32s3-hal/examples/embassy_spi.rs +++ b/esp32s3-hal/examples/embassy_spi.rs @@ -27,7 +27,10 @@ use esp32s3_hal::{ gdma::*, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, IO, }; use esp_backtrace as _; diff --git a/esp32s3-hal/examples/qspi_flash.rs b/esp32s3-hal/examples/qspi_flash.rs index ed9dccc2a58..3e5da22a523 100644 --- a/esp32s3-hal/examples/qspi_flash.rs +++ b/esp32s3-hal/examples/qspi_flash.rs @@ -25,7 +25,7 @@ use esp32s3_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Address, Command, Spi}, + master::{prelude::*, Address, Command, Spi}, SpiDataMode, SpiMode, }, diff --git a/esp32s3-hal/examples/spi_eh1_device_loopback.rs b/esp32s3-hal/examples/spi_eh1_device_loopback.rs index 52715bd1e34..18b36f7ebde 100644 --- a/esp32s3-hal/examples/spi_eh1_device_loopback.rs +++ b/esp32s3-hal/examples/spi_eh1_device_loopback.rs @@ -25,7 +25,7 @@ use esp32s3_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Spi, SpiBusController}, + master::{prelude::*, Spi, SpiBusController}, SpiMode, }, Delay, diff --git a/esp32s3-hal/examples/spi_eh1_loopback.rs b/esp32s3-hal/examples/spi_eh1_loopback.rs index eb28445eb87..9f6107ee938 100644 --- a/esp32s3-hal/examples/spi_eh1_loopback.rs +++ b/esp32s3-hal/examples/spi_eh1_loopback.rs @@ -22,7 +22,10 @@ use esp32s3_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32s3-hal/examples/spi_halfduplex_read_manufacturer_id.rs b/esp32s3-hal/examples/spi_halfduplex_read_manufacturer_id.rs index 88c992adeb2..b682ac60fe7 100644 --- a/esp32s3-hal/examples/spi_halfduplex_read_manufacturer_id.rs +++ b/esp32s3-hal/examples/spi_halfduplex_read_manufacturer_id.rs @@ -23,7 +23,7 @@ use esp32s3_hal::{ peripherals::Peripherals, prelude::*, spi::{ - master::{Address, Command, HalfDuplexReadWrite, Spi}, + master::{prelude::*, Address, Command, HalfDuplexReadWrite, Spi}, SpiDataMode, SpiMode, }, diff --git a/esp32s3-hal/examples/spi_loopback.rs b/esp32s3-hal/examples/spi_loopback.rs index 1d664211ca7..06e1b93f39a 100644 --- a/esp32s3-hal/examples/spi_loopback.rs +++ b/esp32s3-hal/examples/spi_loopback.rs @@ -21,7 +21,10 @@ use esp32s3_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32s3-hal/examples/spi_loopback_dma.rs b/esp32s3-hal/examples/spi_loopback_dma.rs index 19972a3e1d6..2f831a8ebf2 100644 --- a/esp32s3-hal/examples/spi_loopback_dma.rs +++ b/esp32s3-hal/examples/spi_loopback_dma.rs @@ -23,7 +23,10 @@ use esp32s3_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{master::Spi, SpiMode}, + spi::{ + master::{prelude::*, Spi}, + SpiMode, + }, Delay, }; use esp_backtrace as _; diff --git a/esp32s3-hal/examples/spi_slave_dma.rs b/esp32s3-hal/examples/spi_slave_dma.rs index a7c0ac263b0..25fd40f3551 100644 --- a/esp32s3-hal/examples/spi_slave_dma.rs +++ b/esp32s3-hal/examples/spi_slave_dma.rs @@ -32,7 +32,10 @@ use esp32s3_hal::{ gpio::IO, peripherals::Peripherals, prelude::*, - spi::{slave::Spi, SpiMode}, + spi::{ + slave::{prelude::*, Spi}, + SpiMode, + }, timer::TimerGroup, Delay, Rtc,