aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2023-10-12 22:06:29 +0000
committerGitHub <[email protected]>2023-10-12 22:06:29 +0000
commit75baf186f3e5e3cf03e861d90a011f17f2f865f7 (patch)
treec1c086818b1df0ffcc25fdbbdaf64186dddeca4b
parentd1ac6d2824c44bb15ec92074eca8b1a4cf6b409d (diff)
parenta6bbb130c5469437f3a29845328e444d487ab17c (diff)
Merge pull request #2051 from MabezDev/stm32/set_config-concrete
make set_config concrete methods public again
-rw-r--r--embassy-stm32/src/spi/mod.rs7
-rw-r--r--embassy-stm32/src/usart/buffered.rs6
-rw-r--r--embassy-stm32/src/usart/mod.rs4
-rw-r--r--embassy-stm32/src/usart/ringbuffered.rs2
4 files changed, 9 insertions, 10 deletions
diff --git a/embassy-stm32/src/spi/mod.rs b/embassy-stm32/src/spi/mod.rs
index 211b55231..c391e0a5a 100644
--- a/embassy-stm32/src/spi/mod.rs
+++ b/embassy-stm32/src/spi/mod.rs
@@ -322,7 +322,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
322 } 322 }
323 323
324 /// Reconfigures it with the supplied config. 324 /// Reconfigures it with the supplied config.
325 fn set_config(&mut self, config: Config) { 325 pub fn set_config(&mut self, config: &Config) -> Result<(), ()> {
326 let cpha = config.raw_phase(); 326 let cpha = config.raw_phase();
327 let cpol = config.raw_polarity(); 327 let cpol = config.raw_polarity();
328 328
@@ -351,6 +351,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
351 w.set_mbr(br); 351 w.set_mbr(br);
352 }); 352 });
353 } 353 }
354 Ok(())
354 } 355 }
355 356
356 pub fn get_current_config(&self) -> Config { 357 pub fn get_current_config(&self) -> Config {
@@ -1062,8 +1063,6 @@ impl<'d, T: Instance, Tx, Rx> SetConfig for Spi<'d, T, Tx, Rx> {
1062 type Config = Config; 1063 type Config = Config;
1063 type ConfigError = (); 1064 type ConfigError = ();
1064 fn set_config(&mut self, config: &Self::Config) -> Result<(), ()> { 1065 fn set_config(&mut self, config: &Self::Config) -> Result<(), ()> {
1065 self.set_config(*config); 1066 self.set_config(config)
1066
1067 Ok(())
1068 } 1067 }
1069} 1068}
diff --git a/embassy-stm32/src/usart/buffered.rs b/embassy-stm32/src/usart/buffered.rs
index 82d925a43..cbc13a342 100644
--- a/embassy-stm32/src/usart/buffered.rs
+++ b/embassy-stm32/src/usart/buffered.rs
@@ -253,7 +253,7 @@ impl<'d, T: BasicInstance> BufferedUart<'d, T> {
253 (self.tx, self.rx) 253 (self.tx, self.rx)
254 } 254 }
255 255
256 fn set_config(&mut self, config: &Config) -> Result<(), ConfigError> { 256 pub fn set_config(&mut self, config: &Config) -> Result<(), ConfigError> {
257 reconfigure::<T>(config) 257 reconfigure::<T>(config)
258 } 258 }
259} 259}
@@ -333,7 +333,7 @@ impl<'d, T: BasicInstance> BufferedUartRx<'d, T> {
333 } 333 }
334 } 334 }
335 335
336 fn set_config(&mut self, config: &Config) -> Result<(), ConfigError> { 336 pub fn set_config(&mut self, config: &Config) -> Result<(), ConfigError> {
337 reconfigure::<T>(config) 337 reconfigure::<T>(config)
338 } 338 }
339} 339}
@@ -407,7 +407,7 @@ impl<'d, T: BasicInstance> BufferedUartTx<'d, T> {
407 } 407 }
408 } 408 }
409 409
410 fn set_config(&mut self, config: &Config) -> Result<(), ConfigError> { 410 pub fn set_config(&mut self, config: &Config) -> Result<(), ConfigError> {
411 reconfigure::<T>(config) 411 reconfigure::<T>(config)
412 } 412 }
413} 413}
diff --git a/embassy-stm32/src/usart/mod.rs b/embassy-stm32/src/usart/mod.rs
index 3b7f5184d..880ca4162 100644
--- a/embassy-stm32/src/usart/mod.rs
+++ b/embassy-stm32/src/usart/mod.rs
@@ -274,7 +274,7 @@ impl<'d, T: BasicInstance, TxDma> UartTx<'d, T, TxDma> {
274 }) 274 })
275 } 275 }
276 276
277 fn set_config(&mut self, config: &Config) -> Result<(), ConfigError> { 277 pub fn set_config(&mut self, config: &Config) -> Result<(), ConfigError> {
278 reconfigure::<T>(config) 278 reconfigure::<T>(config)
279 } 279 }
280 280
@@ -373,7 +373,7 @@ impl<'d, T: BasicInstance, RxDma> UartRx<'d, T, RxDma> {
373 }) 373 })
374 } 374 }
375 375
376 fn set_config(&mut self, config: &Config) -> Result<(), ConfigError> { 376 pub fn set_config(&mut self, config: &Config) -> Result<(), ConfigError> {
377 reconfigure::<T>(config) 377 reconfigure::<T>(config)
378 } 378 }
379 379
diff --git a/embassy-stm32/src/usart/ringbuffered.rs b/embassy-stm32/src/usart/ringbuffered.rs
index 535d1b1fd..55489f2e0 100644
--- a/embassy-stm32/src/usart/ringbuffered.rs
+++ b/embassy-stm32/src/usart/ringbuffered.rs
@@ -64,7 +64,7 @@ impl<'d, T: BasicInstance, RxDma: super::RxDma<T>> RingBufferedUartRx<'d, T, RxD
64 Err(err) 64 Err(err)
65 } 65 }
66 66
67 fn set_config(&mut self, config: &Config) -> Result<(), ConfigError> { 67 pub fn set_config(&mut self, config: &Config) -> Result<(), ConfigError> {
68 self.teardown_uart(); 68 self.teardown_uart();
69 reconfigure::<T>(config) 69 reconfigure::<T>(config)
70 } 70 }