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

1 files changed, 5 insertions, 3 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
index 5a77a013d..8fb7024be 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
@@ -133,11 +133,12 @@ uint32_t    FileUploadRequestFunc(MessageContainer* requestContainer)
 
     return OK;
 }
+bool FileDone = false;
+FRESULT lFresult = FR_OK;
 uint32_t    FileChunkUploadRequestFunc(MessageContainer* requestContainer)
 {
     //uint32_t status = OK;
     FRESULT Fresult = FR_OK;
-    bool FileDone = false;
 
 
     MessageContainer responseContainer;
@@ -153,8 +154,8 @@ uint32_t    FileChunkUploadRequestFunc(MessageContainer* requestContainer)
 //    memcpy (&ReceivedFileHandle,request->uploadid,sizeof(ReceivedFileHandle));
     //if (ReceivedFileHandle == FileHandle)
     //{
-     KeepAliveOneSecondCounter = 0;
     Fresult = f_write(ReceivedFileHandle,request->buffer.data,request->buffer.len,&WrittenBytes );
+        lFresult = Fresult;
         if(Fresult != FR_OK)
         {
             LOG_ERROR (Fresult,"f_write error");
@@ -202,9 +203,10 @@ uint32_t    FileChunkUploadRequestFunc(MessageContainer* requestContainer)
     responseContainer.continuous = false;
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
+    my_free(request->buffer.data);
     file_chunk_upload_request__free_unpacked(request,NULL);
     my_free(responseContainer.data.data);
-    SendChars(container_buffer, container_size);
+    SendCharsWithType(container_buffer, container_size,MESSAGE_TYPE__FileChunkUploadResponse);
     if (FileDone == true)
         Task_setPri(CommRxTaskHandle, 9);