aboutsummaryrefslogtreecommitdiff
path: root/embassy-embedded-hal/src/shared_bus/blocking
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/blocking
parenta7b1e516504bb0df9f7af42361e4280adcc30417 (diff)
eh: update set_config and add get_config
Diffstat (limited to 'embassy-embedded-hal/src/shared_bus/blocking')
-rw-r--r--embassy-embedded-hal/src/shared_bus/blocking/i2c.rs6
-rw-r--r--embassy-embedded-hal/src/shared_bus/blocking/spi.rs2
2 files changed, 4 insertions, 4 deletions
diff --git a/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs b/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs
index af73df059..233c9e1fd 100644
--- a/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs
+++ b/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs
@@ -148,7 +148,7 @@ where
148 fn read(&mut self, address: u8, buffer: &mut [u8]) -> Result<(), Self::Error> { 148 fn read(&mut self, address: u8, buffer: &mut [u8]) -> Result<(), Self::Error> {
149 self.bus.lock(|bus| { 149 self.bus.lock(|bus| {
150 let mut bus = bus.borrow_mut(); 150 let mut bus = bus.borrow_mut();
151 bus.set_config(&self.config); 151 bus.set_config(&self.config).map_err(|_| I2cDeviceError::Config)?;
152 bus.read(address, buffer).map_err(I2cDeviceError::I2c) 152 bus.read(address, buffer).map_err(I2cDeviceError::I2c)
153 }) 153 })
154 } 154 }
@@ -156,7 +156,7 @@ where
156 fn write(&mut self, address: u8, bytes: &[u8]) -> Result<(), Self::Error> { 156 fn write(&mut self, address: u8, bytes: &[u8]) -> Result<(), Self::Error> {
157 self.bus.lock(|bus| { 157 self.bus.lock(|bus| {
158 let mut bus = bus.borrow_mut(); 158 let mut bus = bus.borrow_mut();
159 bus.set_config(&self.config); 159 bus.set_config(&self.config).map_err(|_| I2cDeviceError::Config)?;
160 bus.write(address, bytes).map_err(I2cDeviceError::I2c) 160 bus.write(address, bytes).map_err(I2cDeviceError::I2c)
161 }) 161 })
162 } 162 }
@@ -164,7 +164,7 @@ where
164 fn write_read(&mut self, address: u8, wr_buffer: &[u8], rd_buffer: &mut [u8]) -> Result<(), Self::Error> { 164 fn write_read(&mut self, address: u8, wr_buffer: &[u8], rd_buffer: &mut [u8]) -> Result<(), Self::Error> {
165 self.bus.lock(|bus| { 165 self.bus.lock(|bus| {
166 let mut bus = bus.borrow_mut(); 166 let mut bus = bus.borrow_mut();
167 bus.set_config(&self.config); 167 bus.set_config(&self.config).map_err(|_| I2cDeviceError::Config)?;
168 bus.write_read(address, wr_buffer, rd_buffer) 168 bus.write_read(address, wr_buffer, rd_buffer)
169 .map_err(I2cDeviceError::I2c) 169 .map_err(I2cDeviceError::I2c)
170 }) 170 })
diff --git a/embassy-embedded-hal/src/shared_bus/blocking/spi.rs b/embassy-embedded-hal/src/shared_bus/blocking/spi.rs
index 6d03d6263..feb0f5b7d 100644
--- a/embassy-embedded-hal/src/shared_bus/blocking/spi.rs
+++ b/embassy-embedded-hal/src/shared_bus/blocking/spi.rs
@@ -163,7 +163,7 @@ where
163 fn transaction(&mut self, operations: &mut [Operation<'_, u8>]) -> Result<(), Self::Error> { 163 fn transaction(&mut self, operations: &mut [Operation<'_, u8>]) -> Result<(), Self::Error> {
164 self.bus.lock(|bus| { 164 self.bus.lock(|bus| {
165 let mut bus = bus.borrow_mut(); 165 let mut bus = bus.borrow_mut();
166 bus.set_config(&self.config); 166 bus.set_config(&self.config).map_err(|_| SpiDeviceError::Config)?;
167 self.cs.set_low().map_err(SpiDeviceError::Cs)?; 167 self.cs.set_low().map_err(SpiDeviceError::Cs)?;
168 168
169 let op_res = operations.iter_mut().try_for_each(|op| match op { 169 let op_res = operations.iter_mut().try_for_each(|op| match op {