Merge branch 'release_2.5-1.4' into bugfix/refrigerator-alarm-cluster

SiliconLabsSoftware · Nov 29, 2024 · b52c3e4 · b52c3e4
2 parents b1a334c + e666bc0
commit b52c3e4
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/platform/silabs/SiWx917/OTAImageProcessorImpl.cpp b/src/platform/silabs/SiWx917/OTAImageProcessorImpl.cpp
@@ -39,7 +39,6 @@ extern "C" {
 #define RPS_HEADER 1
 #define RPS_DATA 2
 
-#define SL_STATUS_FW_UPDATE_DONE SL_STATUS_SI91X_NO_AP_FOUND
 uint8_t flag = RPS_HEADER;
 static chip::OTAImageProcessorImpl gImageProcessor;
 
@@ -185,13 +184,13 @@ void OTAImageProcessorImpl::HandleFinalize(intptr_t context)
 
         if (status != SL_STATUS_OK)
         {
-            if (status == SL_STATUS_FW_UPDATE_DONE)
+            if (status == SL_STATUS_SI91X_FW_UPDATE_DONE)
             {
                 mReset = true;
             }
             else
             {
-                ChipLogError(SoftwareUpdate, "ERROR: In HandleFinalize for last chunk sl_si91x_fwup_load() error %ld", status);
+                ChipLogError(SoftwareUpdate, "ERROR: In HandleFinalize for last chunk sl_si91x_fwup_load() error 0x%lx", status);
                 imageProcessor->mDownloader->EndDownload(CHIP_ERROR_WRITE_FAILED);
                 return;
             }
@@ -302,13 +301,13 @@ void OTAImageProcessorImpl::HandleProcessBlock(intptr_t context)
                 {
                     // If the last chunk of last block-writeBufOffset length is exactly kAlignmentBytes(64) bytes then mReset value
                     // should be set to true in HandleProcessBlock
-                    if (status == SL_STATUS_FW_UPDATE_DONE)
+                    if (status == SL_STATUS_SI91X_FW_UPDATE_DONE)
                     {
                         mReset = true;
                     }
                     else
                     {
-                        ChipLogError(SoftwareUpdate, "ERROR: In HandleProcessBlock sl_si91x_fwup_load() error %ld", status);
+                        ChipLogError(SoftwareUpdate, "ERROR: In HandleProcessBlock sl_si91x_fwup_load() error 0x%lx", status);
                         imageProcessor->mDownloader->EndDownload(CHIP_ERROR_WRITE_FAILED);
                         return;
                     }