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

1 files changed, 11 insertions, 7 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
index 68745b390..c424320ff 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
@@ -35,6 +35,7 @@
 #include "third_party/fatfs/src/diskio.h"
 #include "drivers/Flash_Memory/Flash_Memory.h"
 #include "drivers/Flash_Memory/fatfs/ff.h"
+#include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"
 
 #include "third_party/fatfs/src/ffconf.h"
 
@@ -108,7 +109,7 @@ uint32_t    FileUploadRequestFunc(MessageContainer* requestContainer)
             }
             else
             {
-                free (UploadFileHandle);
+                my_free (UploadFileHandle);
                 UploadFileHandle = 0;
             }
 
@@ -154,7 +155,8 @@ uint32_t    FileChunkUploadRequestFunc(MessageContainer* requestContainer)
 //    memcpy (&ReceivedFileHandle,request->uploadid,sizeof(ReceivedFileHandle));
     //if (ReceivedFileHandle == FileHandle)
     //{
-     KeepAliveOneSecondCounter = 0;
+    Control_WD(ENABLE,10);  //activate heaters/dispenser watchdog, 0.5 seconds
+    KeepAliveOneSecondCounter = 0;
     Fresult = f_write(ReceivedFileHandle,request->buffer.data,request->buffer.len,&WrittenBytes );
         lFresult = Fresult;
         if(Fresult != FR_OK)
@@ -170,7 +172,8 @@ uint32_t    FileChunkUploadRequestFunc(MessageContainer* requestContainer)
             {
                 REPORT_MSG (FileReceivedLength,"file upload ended successfully");
                 f_close(ReceivedFileHandle);
-                free (UploadFileHandle);
+                my_free (UploadFileHandle);
+                UploadFileHandle = 0;
                 FileReceivedLength = 0;
                 FileDone = true;
             }
@@ -180,7 +183,8 @@ uint32_t    FileChunkUploadRequestFunc(MessageContainer* requestContainer)
                 {
                     REPORT_MSG (FileReceivedLength,"file upload too much data!");
                     f_close(ReceivedFileHandle);
-                    free (UploadFileHandle);
+                    my_free (UploadFileHandle);
+                    UploadFileHandle = 0;
                     FileReceivedLength = 0;
                     FileDone = true;
                 }
@@ -204,7 +208,7 @@ 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);
+    //my_free(request->buffer.data);
     file_chunk_upload_request__free_unpacked(request,NULL);
     my_free(responseContainer.data.data);
     SendCharsWithType(container_buffer, container_size,MESSAGE_TYPE__FileChunkUploadResponse);
@@ -299,7 +303,7 @@ uint32_t    FileChunkDownloadRequestFunc(MessageContainer* requestContainer)
             {
                 REPORT_MSG (FileSentLength,"file download ended successfully");
                 f_close(SentFileHandle);
-                free (DownloadFileHandle);
+                my_free (DownloadFileHandle);
                 FileSentLength = 0;
             }
             else
@@ -308,7 +312,7 @@ uint32_t    FileChunkDownloadRequestFunc(MessageContainer* requestContainer)
                 {
                     REPORT_MSG (FileSentLength,"file download too much data!");
                     f_close(SentFileHandle);
-                    free (DownloadFileHandle);
+                    my_free (DownloadFileHandle);
                     FileSentLength = 0;
                 }
             }