diff options
| author | Dario Nieuwenhuis <[email protected]> | 2022-08-22 21:46:09 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2022-08-22 22:18:13 +0200 |
| commit | 21072bee48ff6ec19b79e0d9527ad8cc34a4e9e0 (patch) | |
| tree | b5b8c0f4b3571989b5fd15152be5639f4334c282 /embassy-embedded-hal/src | |
| parent | 61356181b223e95f289ca3af3a038a699cde2112 (diff) | |
split `embassy-util` into `embassy-futures`, `embassy-sync`.
Diffstat (limited to 'embassy-embedded-hal/src')
4 files changed, 14 insertions, 14 deletions
diff --git a/embassy-embedded-hal/src/shared_bus/asynch/i2c.rs b/embassy-embedded-hal/src/shared_bus/asynch/i2c.rs index dc483b826..0bc6afd98 100644 --- a/embassy-embedded-hal/src/shared_bus/asynch/i2c.rs +++ b/embassy-embedded-hal/src/shared_bus/asynch/i2c.rs | |||
| @@ -4,8 +4,8 @@ | |||
| 4 | //! | 4 | //! |
| 5 | //! ```rust | 5 | //! ```rust |
| 6 | //! use embassy_embedded_hal::shared_bus::i2c::I2cDevice; | 6 | //! use embassy_embedded_hal::shared_bus::i2c::I2cDevice; |
| 7 | //! use embassy_util::mutex::Mutex; | 7 | //! use embassy_sync::mutex::Mutex; |
| 8 | //! use embassy_util::blocking_mutex::raw::ThreadModeRawMutex; | 8 | //! use embassy_sync::blocking_mutex::raw::ThreadModeRawMutex; |
| 9 | //! | 9 | //! |
| 10 | //! static I2C_BUS: StaticCell<Mutex::<ThreadModeRawMutex, Twim<TWISPI0>>> = StaticCell::new(); | 10 | //! static I2C_BUS: StaticCell<Mutex::<ThreadModeRawMutex, Twim<TWISPI0>>> = StaticCell::new(); |
| 11 | //! let config = twim::Config::default(); | 11 | //! let config = twim::Config::default(); |
| @@ -24,8 +24,8 @@ | |||
| 24 | //! ``` | 24 | //! ``` |
| 25 | use core::future::Future; | 25 | use core::future::Future; |
| 26 | 26 | ||
| 27 | use embassy_util::blocking_mutex::raw::RawMutex; | 27 | use embassy_sync::blocking_mutex::raw::RawMutex; |
| 28 | use embassy_util::mutex::Mutex; | 28 | use embassy_sync::mutex::Mutex; |
| 29 | use embedded_hal_async::i2c; | 29 | use embedded_hal_async::i2c; |
| 30 | 30 | ||
| 31 | use crate::shared_bus::I2cDeviceError; | 31 | use crate::shared_bus::I2cDeviceError; |
diff --git a/embassy-embedded-hal/src/shared_bus/asynch/spi.rs b/embassy-embedded-hal/src/shared_bus/asynch/spi.rs index bb419d6a6..c95b59ef0 100644 --- a/embassy-embedded-hal/src/shared_bus/asynch/spi.rs +++ b/embassy-embedded-hal/src/shared_bus/asynch/spi.rs | |||
| @@ -4,8 +4,8 @@ | |||
| 4 | //! | 4 | //! |
| 5 | //! ```rust | 5 | //! ```rust |
| 6 | //! use embassy_embedded_hal::shared_bus::spi::SpiDevice; | 6 | //! use embassy_embedded_hal::shared_bus::spi::SpiDevice; |
| 7 | //! use embassy_util::mutex::Mutex; | 7 | //! use embassy_sync::mutex::Mutex; |
| 8 | //! use embassy_util::blocking_mutex::raw::ThreadModeRawMutex; | 8 | //! use embassy_sync::blocking_mutex::raw::ThreadModeRawMutex; |
| 9 | //! | 9 | //! |
| 10 | //! static SPI_BUS: StaticCell<Mutex<ThreadModeRawMutex, spim::Spim<SPI3>>> = StaticCell::new(); | 10 | //! static SPI_BUS: StaticCell<Mutex<ThreadModeRawMutex, spim::Spim<SPI3>>> = StaticCell::new(); |
| 11 | //! let mut config = spim::Config::default(); | 11 | //! let mut config = spim::Config::default(); |
| @@ -27,8 +27,8 @@ | |||
| 27 | //! ``` | 27 | //! ``` |
| 28 | use core::future::Future; | 28 | use core::future::Future; |
| 29 | 29 | ||
| 30 | use embassy_util::blocking_mutex::raw::RawMutex; | 30 | use embassy_sync::blocking_mutex::raw::RawMutex; |
| 31 | use embassy_util::mutex::Mutex; | 31 | use embassy_sync::mutex::Mutex; |
| 32 | use embedded_hal_1::digital::blocking::OutputPin; | 32 | use embedded_hal_1::digital::blocking::OutputPin; |
| 33 | use embedded_hal_1::spi::ErrorType; | 33 | use embedded_hal_1::spi::ErrorType; |
| 34 | use embedded_hal_async::spi; | 34 | use embedded_hal_async::spi; |
diff --git a/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs b/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs index 837312e87..a611e2d27 100644 --- a/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs +++ b/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | //! | 4 | //! |
| 5 | //! ```rust | 5 | //! ```rust |
| 6 | //! use embassy_embedded_hal::shared_bus::blocking::i2c::I2cDevice; | 6 | //! use embassy_embedded_hal::shared_bus::blocking::i2c::I2cDevice; |
| 7 | //! use embassy_util::blocking_mutex::{NoopMutex, raw::NoopRawMutex}; | 7 | //! use embassy_sync::blocking_mutex::{NoopMutex, raw::NoopRawMutex}; |
| 8 | //! | 8 | //! |
| 9 | //! static I2C_BUS: StaticCell<NoopMutex<RefCell<Twim<TWISPI0>>>> = StaticCell::new(); | 9 | //! static I2C_BUS: StaticCell<NoopMutex<RefCell<Twim<TWISPI0>>>> = StaticCell::new(); |
| 10 | //! let irq = interrupt::take!(SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0); | 10 | //! let irq = interrupt::take!(SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0); |
| @@ -18,8 +18,8 @@ | |||
| 18 | 18 | ||
| 19 | use core::cell::RefCell; | 19 | use core::cell::RefCell; |
| 20 | 20 | ||
| 21 | use embassy_util::blocking_mutex::raw::RawMutex; | 21 | use embassy_sync::blocking_mutex::raw::RawMutex; |
| 22 | use embassy_util::blocking_mutex::Mutex; | 22 | use embassy_sync::blocking_mutex::Mutex; |
| 23 | use embedded_hal_1::i2c::blocking::{I2c, Operation}; | 23 | use embedded_hal_1::i2c::blocking::{I2c, Operation}; |
| 24 | use embedded_hal_1::i2c::ErrorType; | 24 | use embedded_hal_1::i2c::ErrorType; |
| 25 | 25 | ||
diff --git a/embassy-embedded-hal/src/shared_bus/blocking/spi.rs b/embassy-embedded-hal/src/shared_bus/blocking/spi.rs index a48d9183c..23845d887 100644 --- a/embassy-embedded-hal/src/shared_bus/blocking/spi.rs +++ b/embassy-embedded-hal/src/shared_bus/blocking/spi.rs | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | //! | 4 | //! |
| 5 | //! ```rust | 5 | //! ```rust |
| 6 | //! use embassy_embedded_hal::shared_bus::blocking::spi::SpiDevice; | 6 | //! use embassy_embedded_hal::shared_bus::blocking::spi::SpiDevice; |
| 7 | //! use embassy_util::blocking_mutex::{NoopMutex, raw::NoopRawMutex}; | 7 | //! use embassy_sync::blocking_mutex::{NoopMutex, raw::NoopRawMutex}; |
| 8 | //! | 8 | //! |
| 9 | //! static SPI_BUS: StaticCell<NoopMutex<RefCell<Spim<SPI3>>>> = StaticCell::new(); | 9 | //! static SPI_BUS: StaticCell<NoopMutex<RefCell<Spim<SPI3>>>> = StaticCell::new(); |
| 10 | //! let irq = interrupt::take!(SPIM3); | 10 | //! let irq = interrupt::take!(SPIM3); |
| @@ -20,8 +20,8 @@ | |||
| 20 | 20 | ||
| 21 | use core::cell::RefCell; | 21 | use core::cell::RefCell; |
| 22 | 22 | ||
| 23 | use embassy_util::blocking_mutex::raw::RawMutex; | 23 | use embassy_sync::blocking_mutex::raw::RawMutex; |
| 24 | use embassy_util::blocking_mutex::Mutex; | 24 | use embassy_sync::blocking_mutex::Mutex; |
| 25 | use embedded_hal_1::digital::blocking::OutputPin; | 25 | use embedded_hal_1::digital::blocking::OutputPin; |
| 26 | use embedded_hal_1::spi; | 26 | use embedded_hal_1::spi; |
| 27 | use embedded_hal_1::spi::blocking::SpiBusFlush; | 27 | use embedded_hal_1::spi::blocking::SpiBusFlush; |
