Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 15 insertions, 18 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c
index 79bbb4df8..bf1151d6e 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c
@@ -53,6 +53,7 @@ uint32_t ActivateVersionCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag)
 {
     ActivateVersionResponse response = ACTIVATE_VERSION_RESPONSE__INIT;
     MessageContainer responseContainer;
+    bool last = true;
 
     usnprintf(activateString, 1000, "file %d of %d bytes %d of %d",CurrentRunningFile,NumberOfFiles,vme_index,CurrentFileSize);
 
@@ -60,16 +61,9 @@ uint32_t ActivateVersionCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag)
 
     if (CurrentRunningFile<NumberOfFiles)
     {
-        responseContainer = createContainer(MESSAGE_TYPE__ActivateVersionResponse,  ActivateToken, false, &response, &activate_version_response__pack, &activate_version_response__get_packed_size);
-        responseContainer.has_continuous = true;
-        responseContainer.continuous = true;
-        uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
-        size_t container_size = message_container__pack(&responseContainer, container_buffer);
-        my_free(responseContainer.data.data);
-        SendChars(container_buffer, container_size);
-        return OK;
+        last = false;
     }
-    responseContainer = createContainer(MESSAGE_TYPE__ActivateVersionResponse,  ActivateToken, true, &response, &activate_version_response__pack, &activate_version_response__get_packed_size);
+    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;
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
@@ -77,16 +71,19 @@ uint32_t ActivateVersionCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag)
     my_free(responseContainer.data.data);
     SendChars(container_buffer, container_size);
 
-    if (SafeRemoveControlCallback(ActivateVersionControlId, ActivateVersionCallBackFunction )==OK)
-        ActivateVersionControlId = 0xFF;
-    else
-        LOG_ERROR(255,"ActivateVersionCallBackFunction");
-
-    if (Reboot == true)
+    if (last == true)
     {
-        LOG_ERROR(255,"Update successful, Rebooting in 5 seconds");
-        Task_sleep (eOneSecond*5);
-        Power_Reset();
+        if (SafeRemoveControlCallback(ActivateVersionControlId, ActivateVersionCallBackFunction )==OK)
+            ActivateVersionControlId = 0xFF;
+        else
+            LOG_ERROR(255,"ActivateVersionCallBackFunction");
+
+        if (Reboot == true)
+        {
+            LOG_ERROR(255,"Update successful, Rebooting in 5 seconds");
+            Task_sleep (eOneSecond*5);
+            Power_Reset();
+        }
     }
     return OK;