nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-22 06:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

embassy-embedded-hal: remove Word generic for blocking SpiDeviceWithConfig.

Browse Source
This commit is contained in:
Dario Nieuwenhuis 2024-05-20 10:55:55 +02:00
parent d64f46ff9e
commit 31887b47bc
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
embassy-embedded-hal/src/shared_bus/blocking/spi.rs
View File

@ -96,22 +96,16 @@ where
/// This is like [`SpiDevice`], with an additional bus configuration that's applied /// This is like [`SpiDevice`], with an additional bus configuration that's applied
/// to the bus before each use using [`SetConfig`]. This allows different /// to the bus before each use using [`SetConfig`]. This allows different
/// devices on the same bus to use different communication settings. /// devices on the same bus to use different communication settings.
pub struct SpiDeviceWithConfig<'a, M: RawMutex, BUS: SetConfig, CS, Word: Copy + 'static = u8> { pub struct SpiDeviceWithConfig<'a, M: RawMutex, BUS: SetConfig, CS> {
bus: &'a Mutex<M, RefCell<BUS>>, bus: &'a Mutex<M, RefCell<BUS>>,
cs: CS, cs: CS,
config: BUS::Config, config: BUS::Config,
_word: core::marker::PhantomData<Word>,
} }
impl<'a, M: RawMutex, BUS: SetConfig, CS> SpiDeviceWithConfig<'a, M, BUS, CS> { impl<'a, M: RawMutex, BUS: SetConfig, CS> SpiDeviceWithConfig<'a, M, BUS, CS> {
/// Create a new `SpiDeviceWithConfig`. /// Create a new `SpiDeviceWithConfig`.
pub fn new(bus: &'a Mutex<M, RefCell<BUS>>, cs: CS, config: BUS::Config) -> Self { pub fn new(bus: &'a Mutex<M, RefCell<BUS>>, cs: CS, config: BUS::Config) -> Self {
Self { Self { bus, cs, config }
bus,
cs,
config,
_word: core::marker::PhantomData,
}
} }
/// Change the device's config at runtime /// Change the device's config at runtime
@ -120,17 +114,16 @@ impl<'a, M: RawMutex, BUS: SetConfig, CS> SpiDeviceWithConfig<'a, M, BUS, CS> {
} }
} }
impl<'a, M, BUS, CS, Word> spi::ErrorType for SpiDeviceWithConfig<'a, M, BUS, CS, Word> impl<'a, M, BUS, CS> spi::ErrorType for SpiDeviceWithConfig<'a, M, BUS, CS>
where where
M: RawMutex, M: RawMutex,
BUS: spi::ErrorType + SetConfig, BUS: spi::ErrorType + SetConfig,
CS: OutputPin, CS: OutputPin,
Word: Copy + 'static,
{ {
type Error = SpiDeviceError<BUS::Error, CS::Error>; type Error = SpiDeviceError<BUS::Error, CS::Error>;
} }
impl<BUS, M, CS, Word> embedded_hal_1::spi::SpiDevice<Word> for SpiDeviceWithConfig<'_, M, BUS, CS, Word> impl<BUS, M, CS, Word> embedded_hal_1::spi::SpiDevice<Word> for SpiDeviceWithConfig<'_, M, BUS, CS>
where where
M: RawMutex, M: RawMutex,
BUS: SpiBus<Word> + SetConfig, BUS: SpiBus<Word> + SetConfig,