Revert "feat(usb-dfu): change usb dfu chunks write mechanism "

This reverts commit c95bf6895a.
This commit is contained in:
Badr Bouslikhin 2024-02-11 19:38:01 +01:00
parent 8f7d80f9f7
commit 72ab04c453
No known key found for this signature in database

View file

@ -60,21 +60,6 @@ impl<'d, DFU: NorFlash, STATE: NorFlash, RST: Reset, const BLOCK_SIZE: usize> Ha
} }
Ok(Request::Dnload) if self.attrs.contains(DfuAttributes::CAN_DOWNLOAD) => { Ok(Request::Dnload) if self.attrs.contains(DfuAttributes::CAN_DOWNLOAD) => {
if req.value == 0 { if req.value == 0 {
match self.updater.prepare_update() {
Ok(_) => {
self.status = Status::Ok;
}
Err(e) => {
self.state = State::Error;
match e {
embassy_boot::FirmwareUpdaterError::Flash(e) => match e {
NorFlashErrorKind::NotAligned => self.status = Status::ErrErase,
_ => self.status = Status::ErrUnknown,
},
_ => self.status = Status::ErrUnknown,
}
}
}
self.state = State::Download; self.state = State::Download;
self.offset = 0; self.offset = 0;
} }
@ -108,7 +93,7 @@ impl<'d, DFU: NorFlash, STATE: NorFlash, RST: Reset, const BLOCK_SIZE: usize> Ha
self.state = State::Error; self.state = State::Error;
return Some(OutResponse::Rejected); return Some(OutResponse::Rejected);
} }
match self.updater.write_firmware_without_erase(self.offset, buf.as_ref()) { match self.updater.write_firmware(self.offset, buf.as_ref()) {
Ok(_) => { Ok(_) => {
self.status = Status::Ok; self.status = Status::Ok;
self.state = State::DlSync; self.state = State::DlSync;