From 83b42e0db620b7fc2364763b452b346b711e8d9f Mon Sep 17 00:00:00 2001 From: Adrian Wowk Date: Wed, 2 Jul 2025 21:18:44 -0500 Subject: style: cleanup with rustfmt --- embassy-rp/src/pio_programs/spi.rs | 21 ++++++++++----------- examples/rp/src/bin/pio_spi.rs | 11 ++++------- examples/rp/src/bin/pio_spi_async.rs | 13 +++++-------- 3 files changed, 19 insertions(+), 26 deletions(-) diff --git a/embassy-rp/src/pio_programs/spi.rs b/embassy-rp/src/pio_programs/spi.rs index 27d401fc9..a1b36c1c8 100644 --- a/embassy-rp/src/pio_programs/spi.rs +++ b/embassy-rp/src/pio_programs/spi.rs @@ -5,24 +5,23 @@ use core::marker::PhantomData; use embassy_futures::join::join; use embassy_hal_internal::Peri; use embedded_hal_02::spi::{Phase, Polarity}; -use fixed::{traits::ToFixed, types::extra::U8}; +use fixed::traits::ToFixed; +use fixed::types::extra::U8; -use crate::{ - clocks::clk_sys_freq, - dma::{AnyChannel, Channel}, - gpio::Level, - pio::{Common, Direction, Instance, LoadedProgram, PioPin, ShiftDirection, StateMachine}, - spi::{Async, Blocking, Mode}, -}; +use crate::clocks::clk_sys_freq; +use crate::dma::{AnyChannel, Channel}; +use crate::gpio::Level; +use crate::pio::{Common, Direction, Instance, LoadedProgram, PioPin, ShiftDirection, StateMachine}; +use crate::spi::{Async, Blocking, Mode}; /// This struct represents a uart tx program loaded into pio instruction memory. -pub struct PioSpiProgram<'d, PIO: crate::pio::Instance> { +pub struct PioSpiProgram<'d, PIO: Instance> { prg: LoadedProgram<'d, PIO>, } -impl<'d, PIO: crate::pio::Instance> PioSpiProgram<'d, PIO> { +impl<'d, PIO: Instance> PioSpiProgram<'d, PIO> { /// Load the spi program into the given pio - pub fn new(common: &mut crate::pio::Common<'d, PIO>, phase: Phase) -> Self { + pub fn new(common: &mut Common<'d, PIO>, phase: Phase) -> Self { // These PIO programs are taken straight from the datasheet (3.6.1 in // RP2040 datasheet, 11.6.1 in RP2350 datasheet) diff --git a/examples/rp/src/bin/pio_spi.rs b/examples/rp/src/bin/pio_spi.rs index 1fbe235e5..0164e4c81 100644 --- a/examples/rp/src/bin/pio_spi.rs +++ b/examples/rp/src/bin/pio_spi.rs @@ -9,13 +9,10 @@ use defmt::*; use embassy_executor::Spawner; -use embassy_rp::{ - bind_interrupts, - peripherals::PIO0, - pio, - pio_programs::spi::{Config, PioSpiProgram, Spi}, - spi::Phase, -}; +use embassy_rp::peripherals::PIO0; +use embassy_rp::pio_programs::spi::{Config, PioSpiProgram, Spi}; +use embassy_rp::spi::Phase; +use embassy_rp::{bind_interrupts, pio}; use embassy_time::Timer; use {defmt_rtt as _, panic_probe as _}; diff --git a/examples/rp/src/bin/pio_spi_async.rs b/examples/rp/src/bin/pio_spi_async.rs index 5abf6fc71..1dbdff609 100644 --- a/examples/rp/src/bin/pio_spi_async.rs +++ b/examples/rp/src/bin/pio_spi_async.rs @@ -9,13 +9,10 @@ use defmt::*; use embassy_executor::Spawner; -use embassy_rp::{ - bind_interrupts, - peripherals::PIO0, - pio, - pio_programs::spi::{Config, PioSpiProgram, Spi}, - spi::Phase, -}; +use embassy_rp::peripherals::PIO0; +use embassy_rp::pio_programs::spi::{Config, PioSpiProgram, Spi}; +use embassy_rp::spi::Phase; +use embassy_rp::{bind_interrupts, pio}; use embassy_time::Timer; use {defmt_rtt as _, panic_probe as _}; @@ -32,7 +29,7 @@ async fn main(_spawner: Spawner) { // use them together regardless let mosi = p.PIN_6; // SPI0 SCLK let miso = p.PIN_7; // SPI0 MOSI - let clk = p.PIN_8; // SPI1 MISO + let clk = p.PIN_8; // SPI1 MISO let pio::Pio { mut common, sm0, .. } = pio::Pio::new(p.PIO0, Irqs); -- cgit