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

1 files changed, 9 insertions, 3 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
index 8682f706a..05b118c90 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
@@ -73,6 +73,7 @@ bool isDirectory(FileAttribute FileAtt)
         return true;
     return false;
 }
+bool FileDone = false;
 
 uint32_t    FileUploadRequestFunc(MessageContainer* requestContainer)
 {
@@ -106,6 +107,7 @@ uint32_t    FileUploadRequestFunc(MessageContainer* requestContainer)
                 response.maxchunklength = MAX_CHUNK_LENGTH;
                 strcpy(FileHandleChar, "1234");
                 response.uploadid = FileHandleChar; //supporting only single file at each time.
+                FileDone = false;
             }
             else
             {
@@ -117,6 +119,7 @@ uint32_t    FileUploadRequestFunc(MessageContainer* requestContainer)
     }
     CommRxTaskHandle = Task_self();
     Task_setPri(CommRxTaskHandle, 4);
+   // Report("Task_setPri", __FILE__, __LINE__, 4, RpWarning,   (int)CommRxTaskHandle, 0);
 
 
     responseContainer = createContainer(MESSAGE_TYPE__FileUploadResponse,  requestContainer->token, false, &response, &file_upload_response__pack, &file_upload_response__get_packed_size);
@@ -134,7 +137,6 @@ uint32_t    FileUploadRequestFunc(MessageContainer* requestContainer)
 
     return OK;
 }
-bool FileDone = false;
 FRESULT lFresult = FR_OK;
 uint32_t    FileChunkUploadRequestFunc(MessageContainer* requestContainer)
 {
@@ -155,7 +157,8 @@ uint32_t    FileChunkUploadRequestFunc(MessageContainer* requestContainer)
 //    memcpy (&ReceivedFileHandle,request->uploadid,sizeof(ReceivedFileHandle));
     //if (ReceivedFileHandle == FileHandle)
     //{
-    Control_WD(ENABLE,10);  //activate heaters/dispenser watchdog, 0.5 seconds
+    Control_WD(ENABLE,55);  //activate heaters/dispenser watchdog, 0.5 seconds
+    GeneralHwReady = false;
     KeepAliveOneSecondCounter = 0;
     Fresult = f_write(ReceivedFileHandle,request->buffer.data,request->buffer.len,&WrittenBytes );
         lFresult = Fresult;
@@ -213,8 +216,11 @@ uint32_t    FileChunkUploadRequestFunc(MessageContainer* requestContainer)
     my_free(responseContainer.data.data);
     SendCharsWithType(container_buffer, container_size,MESSAGE_TYPE__FileChunkUploadResponse);
     if (FileDone == true)
+    {
         Task_setPri(CommRxTaskHandle, 9);
-
+        GeneralHwReady = true;
+        //Report("Task_setPri", __FILE__, __LINE__, 9, RpWarning,   (int)CommRxTaskHandle, 0);
+    }
     return OK;
 }
 uint32_t    FileDownloadRequestFunc(MessageContainer* requestContainer)