From e962f5568a9f6433dcd6ad3e41d3faabb8b7c552 Mon Sep 17 00:00:00 2001 From: James Munns Date: Tue, 9 Dec 2025 15:52:12 +0100 Subject: Clean up remaining examples, move some to "raw" examples --- embassy-mcxa/src/adc.rs | 2 +- embassy-mcxa/src/clkout.rs | 2 +- embassy-mcxa/src/clocks/periph_helpers.rs | 6 +++++- embassy-mcxa/src/i2c/controller.rs | 6 +++--- embassy-mcxa/src/interrupt.rs | 2 +- embassy-mcxa/src/lpuart/buffered.rs | 2 +- embassy-mcxa/src/ostimer.rs | 8 ++++---- 7 files changed, 16 insertions(+), 12 deletions(-) (limited to 'embassy-mcxa/src') diff --git a/embassy-mcxa/src/adc.rs b/embassy-mcxa/src/adc.rs index 7475299ba..b5ec5983f 100644 --- a/embassy-mcxa/src/adc.rs +++ b/embassy-mcxa/src/adc.rs @@ -4,7 +4,7 @@ use core::sync::atomic::{AtomicBool, Ordering}; use embassy_hal_internal::{Peri, PeripheralType}; use crate::clocks::periph_helpers::{AdcClockSel, AdcConfig, Div4}; -use crate::clocks::{Gate, PoweredClock, enable_and_reset}; +use crate::clocks::{enable_and_reset, Gate, PoweredClock}; use crate::pac; use crate::pac::adc1::cfg::{HptExdi, Pwrsel, Refsel, Tcmdres, Tprictrl, Tres}; use crate::pac::adc1::cmdh1::{Avgs, Cmpen, Next, Sts}; diff --git a/embassy-mcxa/src/clkout.rs b/embassy-mcxa/src/clkout.rs index 5b21f24b0..88c731df1 100644 --- a/embassy-mcxa/src/clkout.rs +++ b/embassy-mcxa/src/clkout.rs @@ -9,7 +9,7 @@ use core::marker::PhantomData; use embassy_hal_internal::Peri; pub use crate::clocks::periph_helpers::Div4; -use crate::clocks::{ClockError, PoweredClock, with_clocks}; +use crate::clocks::{with_clocks, ClockError, PoweredClock}; use crate::pac::mrcc0::mrcc_clkout_clksel::Mux; use crate::peripherals::CLKOUT; diff --git a/embassy-mcxa/src/clocks/periph_helpers.rs b/embassy-mcxa/src/clocks/periph_helpers.rs index fed5e558e..1ea7a99ed 100644 --- a/embassy-mcxa/src/clocks/periph_helpers.rs +++ b/embassy-mcxa/src/clocks/periph_helpers.rs @@ -108,7 +108,11 @@ impl Div4 { /// by 1, and `Div4::from_raw(15)` will divide the source by /// 16. pub const fn from_raw(n: u8) -> Option { - if n > 0b1111 { None } else { Some(Self(n)) } + if n > 0b1111 { + None + } else { + Some(Self(n)) + } } /// Store a specific divisor value that will divide the source diff --git a/embassy-mcxa/src/i2c/controller.rs b/embassy-mcxa/src/i2c/controller.rs index c27d508b0..182a53aea 100644 --- a/embassy-mcxa/src/i2c/controller.rs +++ b/embassy-mcxa/src/i2c/controller.rs @@ -3,15 +3,15 @@ use core::future::Future; use core::marker::PhantomData; -use embassy_hal_internal::Peri; use embassy_hal_internal::drop::OnDrop; +use embassy_hal_internal::Peri; use mcxa_pac::lpi2c0::mtdr::Cmd; use super::{Async, Blocking, Error, Instance, InterruptHandler, Mode, Result, SclPin, SdaPin}; -use crate::AnyPin; use crate::clocks::periph_helpers::{Div4, Lpi2cClockSel, Lpi2cConfig}; -use crate::clocks::{PoweredClock, enable_and_reset}; +use crate::clocks::{enable_and_reset, PoweredClock}; use crate::interrupt::typelevel::Interrupt; +use crate::AnyPin; /// Bus speed (nominal SCL, no clock stretching) #[derive(Clone, Copy, Default, PartialEq)] diff --git a/embassy-mcxa/src/interrupt.rs b/embassy-mcxa/src/interrupt.rs index c960af7a2..1b468c6cf 100644 --- a/embassy-mcxa/src/interrupt.rs +++ b/embassy-mcxa/src/interrupt.rs @@ -40,7 +40,7 @@ mod generated { use core::sync::atomic::{AtomicU16, AtomicU32, Ordering}; -pub use generated::interrupt::{Priority, typelevel}; +pub use generated::interrupt::{typelevel, Priority}; use crate::pac::Interrupt; diff --git a/embassy-mcxa/src/lpuart/buffered.rs b/embassy-mcxa/src/lpuart/buffered.rs index 34fdbb76c..8eb443ca7 100644 --- a/embassy-mcxa/src/lpuart/buffered.rs +++ b/embassy-mcxa/src/lpuart/buffered.rs @@ -3,8 +3,8 @@ use core::marker::PhantomData; use core::sync::atomic::{AtomicBool, Ordering}; use core::task::Poll; -use embassy_hal_internal::Peri; use embassy_hal_internal::atomic_ring_buffer::RingBuffer; +use embassy_hal_internal::Peri; use embassy_sync::waitqueue::AtomicWaker; use super::*; diff --git a/embassy-mcxa/src/ostimer.rs b/embassy-mcxa/src/ostimer.rs index 9e66e82d8..c51812e3d 100644 --- a/embassy-mcxa/src/ostimer.rs +++ b/embassy-mcxa/src/ostimer.rs @@ -32,7 +32,7 @@ use core::sync::atomic::{AtomicBool, Ordering}; use embassy_hal_internal::{Peri, PeripheralType}; use crate::clocks::periph_helpers::{OsTimerConfig, OstimerClockSel}; -use crate::clocks::{Gate, PoweredClock, assert_reset, enable_and_reset, is_reset_released, release_reset}; +use crate::clocks::{assert_reset, enable_and_reset, is_reset_released, release_reset, Gate, PoweredClock}; use crate::interrupt::InterruptExt; use crate::pac; @@ -521,11 +521,11 @@ pub mod time_driver { use embassy_time_driver as etd; use super::{ - ALARM_ACTIVE, ALARM_CALLBACK, ALARM_FLAG, ALARM_TARGET_TIME, EVTIMER_HI_MASK, EVTIMER_HI_SHIFT, - LOW_32_BIT_MASK, Regs, bin_to_gray, now_ticks_read, + bin_to_gray, now_ticks_read, Regs, ALARM_ACTIVE, ALARM_CALLBACK, ALARM_FLAG, ALARM_TARGET_TIME, + EVTIMER_HI_MASK, EVTIMER_HI_SHIFT, LOW_32_BIT_MASK, }; use crate::clocks::periph_helpers::{OsTimerConfig, OstimerClockSel}; - use crate::clocks::{PoweredClock, enable_and_reset}; + use crate::clocks::{enable_and_reset, PoweredClock}; use crate::pac; #[allow(non_camel_case_types)] -- cgit