From c95bf6895adfcd33b5238c02620e83c6713205ce Mon Sep 17 00:00:00 2001
From: Badr Bouslikhin <bouslikhin.badr@gmail.com>
Date: Wed, 7 Feb 2024 16:41:58 +0100
Subject: [PATCH] feat(usb-dfu): change usb dfu chunks write mechanism

---
 embassy-usb-dfu/src/dfu.rs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/embassy-usb-dfu/src/dfu.rs b/embassy-usb-dfu/src/dfu.rs
index e99aa70c3..5f2c98684 100644
--- a/embassy-usb-dfu/src/dfu.rs
+++ b/embassy-usb-dfu/src/dfu.rs
@@ -60,6 +60,21 @@ impl<'d, DFU: NorFlash, STATE: NorFlash, RST: Reset, const BLOCK_SIZE: usize> Ha
             }
             Ok(Request::Dnload) if self.attrs.contains(DfuAttributes::CAN_DOWNLOAD) => {
                 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.offset = 0;
                 }
@@ -93,7 +108,7 @@ impl<'d, DFU: NorFlash, STATE: NorFlash, RST: Reset, const BLOCK_SIZE: usize> Ha
                         self.state = State::Error;
                         return Some(OutResponse::Rejected);
                     }
-                    match self.updater.write_firmware(self.offset, buf.as_ref()) {
+                    match self.updater.write_firmware_without_erase(self.offset, buf.as_ref()) {
                         Ok(_) => {
                             self.status = Status::Ok;
                             self.state = State::DlSync;