diff options
| author | Dario Nieuwenhuis <[email protected]> | 2024-07-14 06:54:48 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-07-14 06:54:48 +0000 |
| commit | f5e3f31df77056ddd5ffe376ed5dc829ca851de5 (patch) | |
| tree | 11e06948be539427ee85d7571234017186ab719c | |
| parent | 3937c53fd84b1616a6ed40bcf486e74acc7e6635 (diff) | |
| parent | a5c0d1b79f74865c389360833189ac681a9da6a5 (diff) | |
Merge pull request #3176 from wyager/main
Change const asserts to `core::assert` to avoid invoking `defmt::assert`
| -rw-r--r-- | embassy-boot/src/boot_loader.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/embassy-boot/src/boot_loader.rs b/embassy-boot/src/boot_loader.rs index 789fa34c1..61d61b96e 100644 --- a/embassy-boot/src/boot_loader.rs +++ b/embassy-boot/src/boot_loader.rs | |||
| @@ -236,10 +236,10 @@ impl<ACTIVE: NorFlash, DFU: NorFlash, STATE: NorFlash> BootLoader<ACTIVE, DFU, S | |||
| 236 | /// | 236 | /// |
| 237 | pub fn prepare_boot(&mut self, aligned_buf: &mut [u8]) -> Result<State, BootError> { | 237 | pub fn prepare_boot(&mut self, aligned_buf: &mut [u8]) -> Result<State, BootError> { |
| 238 | const { | 238 | const { |
| 239 | assert!(Self::PAGE_SIZE % ACTIVE::WRITE_SIZE as u32 == 0); | 239 | core::assert!(Self::PAGE_SIZE % ACTIVE::WRITE_SIZE as u32 == 0); |
| 240 | assert!(Self::PAGE_SIZE % ACTIVE::ERASE_SIZE as u32 == 0); | 240 | core::assert!(Self::PAGE_SIZE % ACTIVE::ERASE_SIZE as u32 == 0); |
| 241 | assert!(Self::PAGE_SIZE % DFU::WRITE_SIZE as u32 == 0); | 241 | core::assert!(Self::PAGE_SIZE % DFU::WRITE_SIZE as u32 == 0); |
| 242 | assert!(Self::PAGE_SIZE % DFU::ERASE_SIZE as u32 == 0); | 242 | core::assert!(Self::PAGE_SIZE % DFU::ERASE_SIZE as u32 == 0); |
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | // Ensure we have enough progress pages to store copy progress | 245 | // Ensure we have enough progress pages to store copy progress |