diff options
| author | Andreas Lindahl Flåten (ALF) <[email protected]> | 2025-11-13 11:24:43 +0100 |
|---|---|---|
| committer | Andreas Lindahl Flåten (ALF) <[email protected]> | 2025-11-13 11:26:06 +0100 |
| commit | f72349660eb30f6fc32104db60c33a732a99f6b5 (patch) | |
| tree | f0e5b90c001771a82e469d763d6d2a1deadb7da5 | |
| parent | dccf185e1489c0055fcacdea59ce7837cc4d076d (diff) | |
add changelog and fix rustfmt errors
| -rw-r--r-- | embassy-stm32/CHANGELOG.md | 1 | ||||
| -rw-r--r-- | embassy-stm32/src/flash/c.rs | 17 | ||||
| -rw-r--r-- | embassy-stm32/src/flash/common.rs | 8 |
3 files changed, 21 insertions, 5 deletions
diff --git a/embassy-stm32/CHANGELOG.md b/embassy-stm32/CHANGELOG.md index 3431848d3..7586861ef 100644 --- a/embassy-stm32/CHANGELOG.md +++ b/embassy-stm32/CHANGELOG.md | |||
| @@ -55,6 +55,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 | |||
| 55 | - chore: Updated stm32-metapac and stm32-data dependencies | 55 | - chore: Updated stm32-metapac and stm32-data dependencies |
| 56 | - adc: reogranize and cleanup somewhat. require sample_time to be passed on conversion | 56 | - adc: reogranize and cleanup somewhat. require sample_time to be passed on conversion |
| 57 | - fix: stm32/i2c v2 slave: prevent misaligned reads, error false positives, and incorrect counts of bytes read/written | 57 | - fix: stm32/i2c v2 slave: prevent misaligned reads, error false positives, and incorrect counts of bytes read/written |
| 58 | - feat: add flash support for c0 family ([#4874](https://github.com/embassy-rs/embassy/pull/4874)) | ||
| 58 | 59 | ||
| 59 | ## 0.4.0 - 2025-08-26 | 60 | ## 0.4.0 - 2025-08-26 |
| 60 | 61 | ||
diff --git a/embassy-stm32/src/flash/c.rs b/embassy-stm32/src/flash/c.rs index af3d07ac6..0ad1002b0 100644 --- a/embassy-stm32/src/flash/c.rs +++ b/embassy-stm32/src/flash/c.rs | |||
| @@ -47,8 +47,12 @@ pub(crate) unsafe fn blocking_erase_sector(sector: &FlashSector) -> Result<(), E | |||
| 47 | let idx = (sector.start - super::FLASH_BASE as u32) / super::BANK1_REGION.erase_size as u32; | 47 | let idx = (sector.start - super::FLASH_BASE as u32) / super::BANK1_REGION.erase_size as u32; |
| 48 | 48 | ||
| 49 | #[cfg(feature = "defmt")] | 49 | #[cfg(feature = "defmt")] |
| 50 | defmt::trace!("STM32C0 Erase: addr=0x{:08x}, idx={}, erase_size={}", sector.start, idx, super::BANK1_REGION.erase_size); | 50 | defmt::trace!( |
| 51 | 51 | "STM32C0 Erase: addr=0x{:08x}, idx={}, erase_size={}", | |
| 52 | sector.start, | ||
| 53 | idx, | ||
| 54 | super::BANK1_REGION.erase_size | ||
| 55 | ); | ||
| 52 | 56 | ||
| 53 | wait_busy(); | 57 | wait_busy(); |
| 54 | clear_all_err(); | 58 | clear_all_err(); |
| @@ -72,8 +76,13 @@ pub(crate) unsafe fn blocking_erase_sector(sector: &FlashSector) -> Result<(), E | |||
| 72 | #[cfg(feature = "defmt")] | 76 | #[cfg(feature = "defmt")] |
| 73 | { | 77 | { |
| 74 | let cr_after = pac::FLASH.cr().read(); | 78 | let cr_after = pac::FLASH.cr().read(); |
| 75 | defmt::trace!("FLASH_CR after: 0x{:08x}, PER={}, PNB={}, STRT={}", | 79 | defmt::trace!( |
| 76 | cr_after.0, cr_after.per(), cr_after.pnb(), cr_after.strt()); | 80 | "FLASH_CR after: 0x{:08x}, PER={}, PNB={}, STRT={}", |
| 81 | cr_after.0, | ||
| 82 | cr_after.per(), | ||
| 83 | cr_after.pnb(), | ||
| 84 | cr_after.strt() | ||
| 85 | ); | ||
| 77 | } | 86 | } |
| 78 | }); | 87 | }); |
| 79 | 88 | ||
diff --git a/embassy-stm32/src/flash/common.rs b/embassy-stm32/src/flash/common.rs index 508bb2548..60d00e766 100644 --- a/embassy-stm32/src/flash/common.rs +++ b/embassy-stm32/src/flash/common.rs | |||
| @@ -102,7 +102,13 @@ pub(super) unsafe fn blocking_write( | |||
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | let mut address = base + offset; | 104 | let mut address = base + offset; |
| 105 | trace!("Writing {} bytes at 0x{:x} (base=0x{:x}, offset=0x{:x})", bytes.len(), address, base, offset); | 105 | trace!( |
| 106 | "Writing {} bytes at 0x{:x} (base=0x{:x}, offset=0x{:x})", | ||
| 107 | bytes.len(), | ||
| 108 | address, | ||
| 109 | base, | ||
| 110 | offset | ||
| 111 | ); | ||
| 106 | 112 | ||
| 107 | for chunk in bytes.chunks(WRITE_SIZE) { | 113 | for chunk in bytes.chunks(WRITE_SIZE) { |
| 108 | write_chunk(address, chunk)?; | 114 | write_chunk(address, chunk)?; |
