max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename XXBusDevice to XXDevice.

Browse Source
This commit is contained in:
Dario Nieuwenhuis
2022-07-18 20:01:39 +02:00
parent 4dc800710d
commit a3a40bad6c
5 changed files with 106 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
embassy-embedded-hal/src/shared_bus/blocking/i2c.rs
View File

@ -3,7 +3,7 @@
//! # Example (nrf52)
//!
//! ```rust
//! use embassy_embedded_hal::shared_bus::blocking::i2c::I2cBusDevice;
//! use embassy_embedded_hal::shared_bus::blocking::i2c::I2cDevice;
//! use embassy::blocking_mutex::{NoopMutex, raw::NoopRawMutex};
//!
//! static I2C_BUS: Forever<NoopMutex<RefCell<Twim<TWISPI0>>>> = Forever::new();
@ -12,7 +12,7 @@
//! let i2c_bus = NoopMutex::new(RefCell::new(i2c));
//! let i2c_bus = I2C_BUS.put(i2c_bus);
//!
//! let i2c_dev1 = I2cBusDevice::new(i2c_bus);
//! let i2c_dev1 = I2cDevice::new(i2c_bus);
//! let mpu = Mpu6050::new(i2c_dev1);
//! ```
@ -23,46 +23,46 @@ use embassy::blocking_mutex::Mutex;
use embedded_hal_1::i2c::blocking::{I2c, Operation};
use embedded_hal_1::i2c::ErrorType;
use crate::shared_bus::I2cBusDeviceError;
use crate::shared_bus::I2cDeviceError;
use crate::SetConfig;
pub struct I2cBusDevice<'a, M: RawMutex, BUS> {
pub struct I2cDevice<'a, M: RawMutex, BUS> {
bus: &'a Mutex<M, RefCell<BUS>>,
}
impl<'a, M: RawMutex, BUS> I2cBusDevice<'a, M, BUS> {
impl<'a, M: RawMutex, BUS> I2cDevice<'a, M, BUS> {
pub fn new(bus: &'a Mutex<M, RefCell<BUS>>) -> Self {
Self { bus }
}
}
impl<'a, M: RawMutex, BUS> ErrorType for I2cBusDevice<'a, M, BUS>
impl<'a, M: RawMutex, BUS> ErrorType for I2cDevice<'a, M, BUS>
where
BUS: ErrorType,
{
type Error = I2cBusDeviceError<BUS::Error>;
type Error = I2cDeviceError<BUS::Error>;
}
impl<M, BUS> I2c for I2cBusDevice<'_, M, BUS>
impl<M, BUS> I2c for I2cDevice<'_, M, BUS>
where
M: RawMutex,
BUS: I2c,
{
fn read(&mut self, address: u8, buffer: &mut [u8]) -> Result<(), Self::Error> {
self.bus
.lock(|bus| bus.borrow_mut().read(address, buffer).map_err(I2cBusDeviceError::I2c))
.lock(|bus| bus.borrow_mut().read(address, buffer).map_err(I2cDeviceError::I2c))
}
fn write(&mut self, address: u8, bytes: &[u8]) -> Result<(), Self::Error> {
self.bus
.lock(|bus| bus.borrow_mut().write(address, bytes).map_err(I2cBusDeviceError::I2c))
.lock(|bus| bus.borrow_mut().write(address, bytes).map_err(I2cDeviceError::I2c))
}
fn write_read(&mut self, address: u8, wr_buffer: &[u8], rd_buffer: &mut [u8]) -> Result<(), Self::Error> {
self.bus.lock(|bus| {
bus.borrow_mut()
.write_read(address, wr_buffer, rd_buffer)
.map_err(I2cBusDeviceError::I2c)
.map_err(I2cDeviceError::I2c)
})
}
@ -101,68 +101,68 @@ where
}
}
impl<'a, M, BUS, E> embedded_hal_02::blocking::i2c::Write for I2cBusDevice<'_, M, BUS>
impl<'a, M, BUS, E> embedded_hal_02::blocking::i2c::Write for I2cDevice<'_, M, BUS>
where
M: RawMutex,
BUS: embedded_hal_02::blocking::i2c::Write<Error = E>,
{
type Error = I2cBusDeviceError<E>;
type Error = I2cDeviceError<E>;
fn write<'w>(&mut self, addr: u8, bytes: &'w [u8]) -> Result<(), Self::Error> {
self.bus
.lock(|bus| bus.borrow_mut().write(addr, bytes).map_err(I2cBusDeviceError::I2c))
.lock(|bus| bus.borrow_mut().write(addr, bytes).map_err(I2cDeviceError::I2c))
}
}
impl<'a, M, BUS, E> embedded_hal_02::blocking::i2c::Read for I2cBusDevice<'_, M, BUS>
impl<'a, M, BUS, E> embedded_hal_02::blocking::i2c::Read for I2cDevice<'_, M, BUS>
where
M: RawMutex,
BUS: embedded_hal_02::blocking::i2c::Read<Error = E>,
{
type Error = I2cBusDeviceError<E>;
type Error = I2cDeviceError<E>;
fn read<'w>(&mut self, addr: u8, bytes: &'w mut [u8]) -> Result<(), Self::Error> {
self.bus
.lock(|bus| bus.borrow_mut().read(addr, bytes).map_err(I2cBusDeviceError::I2c))
.lock(|bus| bus.borrow_mut().read(addr, bytes).map_err(I2cDeviceError::I2c))
}
}
impl<'a, M, BUS, E> embedded_hal_02::blocking::i2c::WriteRead for I2cBusDevice<'_, M, BUS>
impl<'a, M, BUS, E> embedded_hal_02::blocking::i2c::WriteRead for I2cDevice<'_, M, BUS>
where
M: RawMutex,
BUS: embedded_hal_02::blocking::i2c::WriteRead<Error = E>,
{
type Error = I2cBusDeviceError<E>;
type Error = I2cDeviceError<E>;
fn write_read<'w>(&mut self, addr: u8, bytes: &'w [u8], buffer: &'w mut [u8]) -> Result<(), Self::Error> {
self.bus.lock(|bus| {
bus.borrow_mut()
.write_read(addr, bytes, buffer)
.map_err(I2cBusDeviceError::I2c)
.map_err(I2cDeviceError::I2c)
})
}
}
pub struct I2cBusDeviceWithConfig<'a, M: RawMutex, BUS: SetConfig> {
pub struct I2cDeviceWithConfig<'a, M: RawMutex, BUS: SetConfig> {
bus: &'a Mutex<M, RefCell<BUS>>,
config: BUS::Config,
}
impl<'a, M: RawMutex, BUS: SetConfig> I2cBusDeviceWithConfig<'a, M, BUS> {
impl<'a, M: RawMutex, BUS: SetConfig> I2cDeviceWithConfig<'a, M, BUS> {
pub fn new(bus: &'a Mutex<M, RefCell<BUS>>, config: BUS::Config) -> Self {
Self { bus, config }
}
}
impl<'a, M, BUS> ErrorType for I2cBusDeviceWithConfig<'a, M, BUS>
impl<'a, M, BUS> ErrorType for I2cDeviceWithConfig<'a, M, BUS>
where
M: RawMutex,
BUS: ErrorType + SetConfig,
{
type Error = I2cBusDeviceError<BUS::Error>;
type Error = I2cDeviceError<BUS::Error>;
}
impl<M, BUS> I2c for I2cBusDeviceWithConfig<'_, M, BUS>
impl<M, BUS> I2c for I2cDeviceWithConfig<'_, M, BUS>
where
M: RawMutex,
BUS: I2c + SetConfig,
@ -171,7 +171,7 @@ where
self.bus.lock(|bus| {
let mut bus = bus.borrow_mut();
bus.set_config(&self.config);
bus.read(address, buffer).map_err(I2cBusDeviceError::I2c)
bus.read(address, buffer).map_err(I2cDeviceError::I2c)
})
}
@ -179,7 +179,7 @@ where
self.bus.lock(|bus| {
let mut bus = bus.borrow_mut();
bus.set_config(&self.config);
bus.write(address, bytes).map_err(I2cBusDeviceError::I2c)
bus.write(address, bytes).map_err(I2cDeviceError::I2c)
})
}
@ -188,7 +188,7 @@ where
let mut bus = bus.borrow_mut();
bus.set_config(&self.config);
bus.write_read(address, wr_buffer, rd_buffer)
.map_err(I2cBusDeviceError::I2c)
.map_err(I2cDeviceError::I2c)
})
}