diff options
| author | Ulf Lilleengen <[email protected]> | 2024-09-19 09:15:08 +0200 |
|---|---|---|
| committer | Ulf Lilleengen <[email protected]> | 2024-09-19 09:16:19 +0200 |
| commit | ab0a227e4c02137bc3a621907d17ede0ace4cb1d (patch) | |
| tree | 93e7b4e82f113283fa1b136871d48416968d52f3 /embassy-boot/src/firmware_updater/blocking.rs | |
| parent | b1897c58fa617dbab02b39e7f5e399ed1c9d54b4 (diff) | |
Ensure bootloader state is parsed correctly
Diffstat (limited to 'embassy-boot/src/firmware_updater/blocking.rs')
| -rw-r--r-- | embassy-boot/src/firmware_updater/blocking.rs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/embassy-boot/src/firmware_updater/blocking.rs b/embassy-boot/src/firmware_updater/blocking.rs index 5f64b4be9..08062b0d0 100644 --- a/embassy-boot/src/firmware_updater/blocking.rs +++ b/embassy-boot/src/firmware_updater/blocking.rs | |||
| @@ -339,14 +339,7 @@ impl<'d, STATE: NorFlash> BlockingFirmwareState<'d, STATE> { | |||
| 339 | /// `mark_booted`. | 339 | /// `mark_booted`. |
| 340 | pub fn get_state(&mut self) -> Result<State, FirmwareUpdaterError> { | 340 | pub fn get_state(&mut self) -> Result<State, FirmwareUpdaterError> { |
| 341 | self.state.read(0, &mut self.aligned)?; | 341 | self.state.read(0, &mut self.aligned)?; |
| 342 | 342 | Ok(State::from(&self.aligned)) | |
| 343 | if !self.aligned.iter().any(|&b| b != SWAP_MAGIC) { | ||
| 344 | Ok(State::Swap) | ||
| 345 | } else if !self.aligned.iter().any(|&b| b != DFU_DETACH_MAGIC) { | ||
| 346 | Ok(State::DfuDetach) | ||
| 347 | } else { | ||
| 348 | Ok(State::Boot) | ||
| 349 | } | ||
| 350 | } | 343 | } |
| 351 | 344 | ||
| 352 | /// Mark to trigger firmware swap on next boot. | 345 | /// Mark to trigger firmware swap on next boot. |