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

1 files changed, 20 insertions, 1 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
index 84d8fa725..1b53a826b 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
@@ -35,6 +35,7 @@
 #include "drivers/Flash_Memory/fatfs/ff.h"
 #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"
 
+#include "Modules/Control/Control.h"
 #include "StateMachines/Printing/PrintingSTM.h"
 
 
@@ -152,6 +153,20 @@ uint32_t    FileUploadRequestFunc(MessageContainer* requestContainer)
     return OK;
 }
 FRESULT lFresult = FR_OK;
+uint32_t Chunk_ControlId = 0xFF;
+uint32_t FileChunkUploadCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag)
+{
+    Report("chunk timeout error",__FILE__,IfIndex,FileReceivedLength,RpWarning,BusyFlag,0);
+    f_close(UploadFileHandle);
+    my_free (UploadFileHandle);
+    UploadFileHandle = 0;
+    FileReceivedLength = 0;
+    FileDone = true;
+    if (SafeRemoveControlCallback(Chunk_ControlId, FileChunkUploadCallBackFunction )==OK)
+        Chunk_ControlId = 0xFF;
+
+}
+
 uint32_t    FileChunkUploadRequestFunc(MessageContainer* requestContainer)
 {
     //uint32_t status = OK;
@@ -177,13 +192,15 @@ uint32_t    FileChunkUploadRequestFunc(MessageContainer* requestContainer)
     if (ReceivedFileHandle==NULL)
     {
         Fresult = FR_DENIED;
-        Report("file chunk uplad rejected - file not created", __FILE__, __LINE__, 4, RpWarning,   (int)0, 0);
+        Report("file chunk upload rejected - file not created", __FILE__, __LINE__, 4, RpWarning,   (int)0, 0);
         FileDone = true;
     }
     else
     {
         KeepAliveOneSecondCounter = 0;
         save_milisec = msec_millisecondCounter;
+        Chunk_ControlId = AddControlCallback("chunk", FileChunkUploadCallBackFunction, eOneSecond, TemplateDataReadCBFunction,0,request->buffer.len, WrittenBytes );
+
         Fresult = f_write(ReceivedFileHandle,request->buffer.data,request->buffer.len,&WrittenBytes );
         lFresult = Fresult;
         if(Fresult != FR_OK)
@@ -195,6 +212,8 @@ uint32_t    FileChunkUploadRequestFunc(MessageContainer* requestContainer)
         {
             FileReceivedLength += WrittenBytes;
             ReportWithPackageFilter(CommFilter,"Chunk received", __FILE__,FileLength,FileReceivedLength, RpMessage,msec_millisecondCounter-save_milisec, 0);
+            RemoveControlCallback(Chunk_ControlId, FileChunkUploadCallBackFunction );
+            Chunk_ControlId = 0xFF;
 
             //REPORT_MSG (FileReceivedLength,"file upload chunk");
             if (FileReceivedLength == FileLength)