From 338edba081dba2a2aefb634811be1cc84ec93d64 Mon Sep 17 00:00:00 2001
From: Avi Levkovich <avi@twine-s.com>
Date: Tue, 25 Aug 2020 10:08:01 +0300
Subject: merge

---
 Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'Software/Embedded_SW/Embedded/Common/SWUpdate')

diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c
index 013a06e22..3a1a4ab83 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c
@@ -56,14 +56,15 @@ uint32_t ActivateVersionCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag)
     MessageContainer responseContainer;
     bool last = true;
 
-    usnprintf(activateString, 1000, "file %d of %d bytes %d of %d",CurrentRunningFile+1,NumberOfFiles,vme_index,CurrentFileSize);
-
-    Report(activateString,__FILE__,__LINE__,(int)CurrentRunningFile,RpWarning,CurrentFileSize,0);
-
     if (CurrentRunningFile<NumberOfFiles)
     {
         last = false;
     }
+
+    usnprintf(activateString, 1000, "file %d of %d bytes %d of %d last %d",CurrentRunningFile+1,NumberOfFiles,vme_index,CurrentFileSize,last);
+
+    Report(activateString,__FILE__,__LINE__,(int)CurrentRunningFile,RpWarning,CurrentFileSize,0);
+
     responseContainer = createContainer(MESSAGE_TYPE__ActivateVersionResponse,  ActivateToken, last, &response, &activate_version_response__pack, &activate_version_response__get_packed_size);
     responseContainer.has_continuous = true;
     responseContainer.continuous = true;
-- 
cgit v1.3.1