diff options
| author | Dario Nieuwenhuis <[email protected]> | 2025-09-05 19:37:43 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-09-05 19:37:43 +0000 |
| commit | 24902b9bfb927ef539215c9d657bc39233180360 (patch) | |
| tree | 299b66c0b6b1241faf7358398a2dac04ca9a98af | |
| parent | 46bf0c71cceacc68fa739726d374e27f1a17bba0 (diff) | |
| parent | 59af53d53ee99ea133790ad41a85d67cdb1d78b6 (diff) | |
Merge pull request #4640 from universalhandle/4577-dropped-channel-disables-dac
fix(embassy-stm32): Remove duplicate fn call, vestigial from earlier refcount implementation
| -rw-r--r-- | embassy-stm32/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | embassy-stm32/src/dac/mod.rs | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/embassy-stm32/CHANGELOG.md b/embassy-stm32/CHANGELOG.md index a473834dd..5635481fa 100644 --- a/embassy-stm32/CHANGELOG.md +++ b/embassy-stm32/CHANGELOG.md | |||
| @@ -13,9 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 | |||
| 13 | - fix: stm32/i2c in master mode (blocking): subsequent transmissions failed after a NACK was received | 13 | - fix: stm32/i2c in master mode (blocking): subsequent transmissions failed after a NACK was received |
| 14 | - feat: stm32/timer: add set_polarity functions for main and complementary outputs in complementary_pwm | 14 | - feat: stm32/timer: add set_polarity functions for main and complementary outputs in complementary_pwm |
| 15 | - Add I2S support for STM32F1, STM32C0, STM32F0, STM32F3, STM32F7, STM32G0, STM32WL, STM32H5, STM32H7RS | 15 | - Add I2S support for STM32F1, STM32C0, STM32F0, STM32F3, STM32F7, STM32G0, STM32WL, STM32H5, STM32H7RS |
| 16 | ### Fixed | 16 | - fix: STM32: Prevent dropped DacChannel from disabling Dac peripheral if another DacChannel is still in scope ([#4577](https://github.com/embassy-rs/embassy/pull/4577)) |
| 17 | |||
| 18 | - STM32: Prevent dropped DacChannel from disabling Dac peripheral if another DacChannel is still in scope ([#4577](https://github.com/embassy-rs/embassy/pull/4577)) | ||
| 19 | - feat: Added support for more OctoSPI configurations (e.g. APS6408 RAM) ([#4581](https://github.com/embassy-rs/embassy/pull/4581)) | 17 | - feat: Added support for more OctoSPI configurations (e.g. APS6408 RAM) ([#4581](https://github.com/embassy-rs/embassy/pull/4581)) |
| 20 | 18 | ||
| 21 | ## 0.4.0 - 2025-08-26 | 19 | ## 0.4.0 - 2025-08-26 |
diff --git a/embassy-stm32/src/dac/mod.rs b/embassy-stm32/src/dac/mod.rs index bc6c3cd34..08e001337 100644 --- a/embassy-stm32/src/dac/mod.rs +++ b/embassy-stm32/src/dac/mod.rs | |||
| @@ -575,8 +575,6 @@ impl<'d, T: Instance, M: PeriMode> Dac<'d, T, M> { | |||
| 575 | dma_ch2: Option<ChannelAndRequest<'d>>, | 575 | dma_ch2: Option<ChannelAndRequest<'d>>, |
| 576 | #[cfg(any(dac_v3, dac_v4, dac_v5, dac_v6, dac_v7))] mode: Mode, | 576 | #[cfg(any(dac_v3, dac_v4, dac_v5, dac_v6, dac_v7))] mode: Mode, |
| 577 | ) -> Self { | 577 | ) -> Self { |
| 578 | // Enable twice to increment the DAC refcount for each channel. | ||
| 579 | rcc::enable_and_reset::<T>(); | ||
| 580 | rcc::enable_and_reset::<T>(); | 578 | rcc::enable_and_reset::<T>(); |
| 581 | 579 | ||
| 582 | let mut ch1 = DacCh1 { | 580 | let mut ch1 = DacCh1 { |
