aboutsummaryrefslogtreecommitdiff
path: root/embassy-embedded-hal/src/shared_bus
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2022-08-22 15:51:44 +0200
committerDario Nieuwenhuis <[email protected]>2022-08-22 16:11:40 +0200
commit478f4727846f6a43c28fff3b09cb639c0b800465 (patch)
treeb1b3f644b77c6fcf4a0bbe2eabe19caba27c4c08 /embassy-embedded-hal/src/shared_bus
parent1b9599025868d3a5d0d8e773593b05df8b2fecf2 (diff)
Remove Forever, switch to static_cell.
Diffstat (limited to 'embassy-embedded-hal/src/shared_bus')
-rw-r--r--embassy-embedded-hal/src/shared_bus/asynch/i2c.rs4
-rw-r--r--embassy-embedded-hal/src/shared_bus/asynch/spi.rs4
-rw-r--r--embassy-embedded-hal/src/shared_bus/blocking/i2c.rs4
-rw-r--r--embassy-embedded-hal/src/shared_bus/blocking/spi.rs4
4 files changed, 8 insertions, 8 deletions
diff --git a/embassy-embedded-hal/src/shared_bus/asynch/i2c.rs b/embassy-embedded-hal/src/shared_bus/asynch/i2c.rs
index bd023fb6a..dc483b826 100644
--- a/embassy-embedded-hal/src/shared_bus/asynch/i2c.rs
+++ b/embassy-embedded-hal/src/shared_bus/asynch/i2c.rs
@@ -7,12 +7,12 @@
7//! use embassy_util::mutex::Mutex; 7//! use embassy_util::mutex::Mutex;
8//! use embassy_util::blocking_mutex::raw::ThreadModeRawMutex; 8//! use embassy_util::blocking_mutex::raw::ThreadModeRawMutex;
9//! 9//!
10//! static I2C_BUS: Forever<Mutex::<ThreadModeRawMutex, Twim<TWISPI0>>> = Forever::new(); 10//! static I2C_BUS: StaticCell<Mutex::<ThreadModeRawMutex, Twim<TWISPI0>>> = StaticCell::new();
11//! let config = twim::Config::default(); 11//! let config = twim::Config::default();
12//! let irq = interrupt::take!(SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0); 12//! let irq = interrupt::take!(SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0);
13//! let i2c = Twim::new(p.TWISPI0, irq, p.P0_03, p.P0_04, config); 13//! let i2c = Twim::new(p.TWISPI0, irq, p.P0_03, p.P0_04, config);
14//! let i2c_bus = Mutex::<ThreadModeRawMutex, _>::new(i2c); 14//! let i2c_bus = Mutex::<ThreadModeRawMutex, _>::new(i2c);
15//! let i2c_bus = I2C_BUS.put(i2c_bus); 15//! let i2c_bus = I2C_BUS.init(i2c_bus);
16//! 16//!
17//! // Device 1, using embedded-hal-async compatible driver for QMC5883L compass 17//! // Device 1, using embedded-hal-async compatible driver for QMC5883L compass
18//! let i2c_dev1 = I2cDevice::new(i2c_bus); 18//! let i2c_dev1 = I2cDevice::new(i2c_bus);
diff --git a/embassy-embedded-hal/src/shared_bus/asynch/spi.rs b/embassy-embedded-hal/src/shared_bus/asynch/spi.rs
index caa37f6f3..bb419d6a6 100644
--- a/embassy-embedded-hal/src/shared_bus/asynch/spi.rs
+++ b/embassy-embedded-hal/src/shared_bus/asynch/spi.rs
@@ -7,13 +7,13 @@
7//! use embassy_util::mutex::Mutex; 7//! use embassy_util::mutex::Mutex;
8//! use embassy_util::blocking_mutex::raw::ThreadModeRawMutex; 8//! use embassy_util::blocking_mutex::raw::ThreadModeRawMutex;
9//! 9//!
10//! static SPI_BUS: Forever<Mutex<ThreadModeRawMutex, spim::Spim<SPI3>>> = Forever::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();
12//! config.frequency = spim::Frequency::M32; 12//! config.frequency = spim::Frequency::M32;
13//! let irq = interrupt::take!(SPIM3); 13//! let irq = interrupt::take!(SPIM3);
14//! let spi = spim::Spim::new_txonly(p.SPI3, irq, p.P0_15, p.P0_18, config); 14//! let spi = spim::Spim::new_txonly(p.SPI3, irq, p.P0_15, p.P0_18, config);
15//! let spi_bus = Mutex::<ThreadModeRawMutex, _>::new(spi); 15//! let spi_bus = Mutex::<ThreadModeRawMutex, _>::new(spi);
16//! let spi_bus = SPI_BUS.put(spi_bus); 16//! let spi_bus = SPI_BUS.init(spi_bus);
17//! 17//!
18//! // Device 1, using embedded-hal-async compatible driver for ST7735 LCD display 18//! // Device 1, using embedded-hal-async compatible driver for ST7735 LCD display
19//! let cs_pin1 = Output::new(p.P0_24, Level::Low, OutputDrive::Standard); 19//! let cs_pin1 = Output::new(p.P0_24, Level::Low, OutputDrive::Standard);
diff --git a/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs b/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs
index 1fc343d15..837312e87 100644
--- a/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs
+++ b/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs
@@ -6,11 +6,11 @@
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_util::blocking_mutex::{NoopMutex, raw::NoopRawMutex};
8//! 8//!
9//! static I2C_BUS: Forever<NoopMutex<RefCell<Twim<TWISPI0>>>> = Forever::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);
11//! let i2c = Twim::new(p.TWISPI0, irq, p.P0_03, p.P0_04, Config::default()); 11//! let i2c = Twim::new(p.TWISPI0, irq, p.P0_03, p.P0_04, Config::default());
12//! let i2c_bus = NoopMutex::new(RefCell::new(i2c)); 12//! let i2c_bus = NoopMutex::new(RefCell::new(i2c));
13//! let i2c_bus = I2C_BUS.put(i2c_bus); 13//! let i2c_bus = I2C_BUS.init(i2c_bus);
14//! 14//!
15//! let i2c_dev1 = I2cDevice::new(i2c_bus); 15//! let i2c_dev1 = I2cDevice::new(i2c_bus);
16//! let mpu = Mpu6050::new(i2c_dev1); 16//! let mpu = Mpu6050::new(i2c_dev1);
diff --git a/embassy-embedded-hal/src/shared_bus/blocking/spi.rs b/embassy-embedded-hal/src/shared_bus/blocking/spi.rs
index a61326594..a48d9183c 100644
--- a/embassy-embedded-hal/src/shared_bus/blocking/spi.rs
+++ b/embassy-embedded-hal/src/shared_bus/blocking/spi.rs
@@ -6,11 +6,11 @@
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_util::blocking_mutex::{NoopMutex, raw::NoopRawMutex};
8//! 8//!
9//! static SPI_BUS: Forever<NoopMutex<RefCell<Spim<SPI3>>>> = Forever::new(); 9//! static SPI_BUS: StaticCell<NoopMutex<RefCell<Spim<SPI3>>>> = StaticCell::new();
10//! let irq = interrupt::take!(SPIM3); 10//! let irq = interrupt::take!(SPIM3);
11//! let spi = Spim::new_txonly(p.SPI3, irq, p.P0_15, p.P0_18, Config::default()); 11//! let spi = Spim::new_txonly(p.SPI3, irq, p.P0_15, p.P0_18, Config::default());
12//! let spi_bus = NoopMutex::new(RefCell::new(spi)); 12//! let spi_bus = NoopMutex::new(RefCell::new(spi));
13//! let spi_bus = SPI_BUS.put(spi_bus); 13//! let spi_bus = SPI_BUS.init(spi_bus);
14//! 14//!
15//! // Device 1, using embedded-hal compatible driver for ST7735 LCD display 15//! // Device 1, using embedded-hal compatible driver for ST7735 LCD display
16//! let cs_pin1 = Output::new(p.P0_24, Level::Low, OutputDrive::Standard); 16//! let cs_pin1 = Output::new(p.P0_24, Level::Low, OutputDrive::Standard);