aboutsummaryrefslogtreecommitdiff
path: root/embassy-embedded-hal/src/shared_bus/asynch
diff options
context:
space:
mode:
authorxoviat <[email protected]>2023-10-01 09:37:20 -0500
committerxoviat <[email protected]>2023-10-01 09:37:20 -0500
commit5ad34404af9b7cfecfed5075d987c4c03ff2ca27 (patch)
tree72f07beb474ef99a94408aba6b9c0362aa454889 /embassy-embedded-hal/src/shared_bus/asynch
parenta7b1e516504bb0df9f7af42361e4280adcc30417 (diff)
eh: update set_config and add get_config
Diffstat (limited to 'embassy-embedded-hal/src/shared_bus/asynch')
-rw-r--r--embassy-embedded-hal/src/shared_bus/asynch/i2c.rs8
-rw-r--r--embassy-embedded-hal/src/shared_bus/asynch/spi.rs2
2 files changed, 5 insertions, 5 deletions
diff --git a/embassy-embedded-hal/src/shared_bus/asynch/i2c.rs b/embassy-embedded-hal/src/shared_bus/asynch/i2c.rs
index 87e8a4304..1053d3849 100644
--- a/embassy-embedded-hal/src/shared_bus/asynch/i2c.rs
+++ b/embassy-embedded-hal/src/shared_bus/asynch/i2c.rs
@@ -125,14 +125,14 @@ where
125{ 125{
126 async fn read(&mut self, address: u8, buffer: &mut [u8]) -> Result<(), I2cDeviceError<BUS::Error>> { 126 async fn read(&mut self, address: u8, buffer: &mut [u8]) -> Result<(), I2cDeviceError<BUS::Error>> {
127 let mut bus = self.bus.lock().await; 127 let mut bus = self.bus.lock().await;
128 bus.set_config(&self.config); 128 bus.set_config(&self.config).map_err(|_| I2cDeviceError::Config)?;
129 bus.read(address, buffer).await.map_err(I2cDeviceError::I2c)?; 129 bus.read(address, buffer).await.map_err(I2cDeviceError::I2c)?;
130 Ok(()) 130 Ok(())
131 } 131 }
132 132
133 async fn write(&mut self, address: u8, bytes: &[u8]) -> Result<(), I2cDeviceError<BUS::Error>> { 133 async fn write(&mut self, address: u8, bytes: &[u8]) -> Result<(), I2cDeviceError<BUS::Error>> {
134 let mut bus = self.bus.lock().await; 134 let mut bus = self.bus.lock().await;
135 bus.set_config(&self.config); 135 bus.set_config(&self.config).map_err(|_| I2cDeviceError::Config)?;
136 bus.write(address, bytes).await.map_err(I2cDeviceError::I2c)?; 136 bus.write(address, bytes).await.map_err(I2cDeviceError::I2c)?;
137 Ok(()) 137 Ok(())
138 } 138 }
@@ -144,7 +144,7 @@ where
144 rd_buffer: &mut [u8], 144 rd_buffer: &mut [u8],
145 ) -> Result<(), I2cDeviceError<BUS::Error>> { 145 ) -> Result<(), I2cDeviceError<BUS::Error>> {
146 let mut bus = self.bus.lock().await; 146 let mut bus = self.bus.lock().await;
147 bus.set_config(&self.config); 147 bus.set_config(&self.config).map_err(|_| I2cDeviceError::Config)?;
148 bus.write_read(address, wr_buffer, rd_buffer) 148 bus.write_read(address, wr_buffer, rd_buffer)
149 .await 149 .await
150 .map_err(I2cDeviceError::I2c)?; 150 .map_err(I2cDeviceError::I2c)?;
@@ -153,7 +153,7 @@ where
153 153
154 async fn transaction(&mut self, address: u8, operations: &mut [i2c::Operation<'_>]) -> Result<(), Self::Error> { 154 async fn transaction(&mut self, address: u8, operations: &mut [i2c::Operation<'_>]) -> Result<(), Self::Error> {
155 let mut bus = self.bus.lock().await; 155 let mut bus = self.bus.lock().await;
156 bus.set_config(&self.config); 156 bus.set_config(&self.config).map_err(|_| I2cDeviceError::Config)?;
157 bus.transaction(address, operations) 157 bus.transaction(address, operations)
158 .await 158 .await
159 .map_err(I2cDeviceError::I2c)?; 159 .map_err(I2cDeviceError::I2c)?;
diff --git a/embassy-embedded-hal/src/shared_bus/asynch/spi.rs b/embassy-embedded-hal/src/shared_bus/asynch/spi.rs
index 030392183..b2a9f1e33 100644
--- a/embassy-embedded-hal/src/shared_bus/asynch/spi.rs
+++ b/embassy-embedded-hal/src/shared_bus/asynch/spi.rs
@@ -130,7 +130,7 @@ where
130{ 130{
131 async fn transaction(&mut self, operations: &mut [spi::Operation<'_, u8>]) -> Result<(), Self::Error> { 131 async fn transaction(&mut self, operations: &mut [spi::Operation<'_, u8>]) -> Result<(), Self::Error> {
132 let mut bus = self.bus.lock().await; 132 let mut bus = self.bus.lock().await;
133 bus.set_config(&self.config); 133 bus.set_config(&self.config).map_err(|_| SpiDeviceError::Config)?;
134 self.cs.set_low().map_err(SpiDeviceError::Cs)?; 134 self.cs.set_low().map_err(SpiDeviceError::Cs)?;
135 135
136 let op_res: Result<(), BUS::Error> = try { 136 let op_res: Result<(), BUS::Error> = try {