Version 1.4.6.18 fix mkdir failure FR_EXISTS

1 files changed, 16 insertions, 13 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
index 6715e8e42..feac91829 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
@@ -140,7 +140,7 @@ uint32_t    FileUploadRequestFunc(MessageContainer* requestContainer)
     {
         responseContainer.has_error = true;
         responseContainer.error = getErrorCode(Fresult);
-        responseContainer.errormessage = "File operation error";
+        responseContainer.errormessage = "File operation upload request error";
     }
     responseContainer.continuous = false;
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
@@ -226,7 +226,7 @@ uint32_t    FileChunkUploadRequestFunc(MessageContainer* requestContainer)
     {
         responseContainer.has_error = true;
         responseContainer.error = getErrorCode(Fresult);
-        responseContainer.errormessage = "File operation error";
+        responseContainer.errormessage = "File operation chunk upload error";
     }
     responseContainer.continuous = false;
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
@@ -316,7 +316,7 @@ uint32_t    FileDownloadRequestFunc(MessageContainer* requestContainer)
     {
         responseContainer.has_error = true;
         responseContainer.error = getErrorCode(Fresult);
-        responseContainer.errormessage = "File operation error";
+        responseContainer.errormessage = "File operation download request error";
     }
     responseContainer.continuous = false;
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
@@ -381,7 +381,7 @@ uint32_t    FileChunkDownloadRequestFunc(MessageContainer* requestContainer)
     {
         responseContainer.has_error = true;
         responseContainer.error = getErrorCode(Fresult);
-        responseContainer.errormessage = "File operation error";
+        responseContainer.errormessage = "File operation chunk download error";
     }
     responseContainer.continuous = false;
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
@@ -409,7 +409,7 @@ uint32_t    ExecuteProcessRequestFunc(MessageContainer* requestContainer)
     {
         responseContainer.has_error = true;
         responseContainer.error = ERROR_CODE__GENERAL_ERROR;//getErrorCode(Fresult);
-        responseContainer.errormessage = "File operation error";
+        responseContainer.errormessage = "File operation execute error";
     }
     responseContainer.continuous = false;
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
@@ -436,7 +436,7 @@ uint32_t    KillProcessRequestFunc(MessageContainer* requestContainer)
     {
         responseContainer.has_error = true;
         responseContainer.error = ERROR_CODE__GENERAL_ERROR;//getErrorCode(Fresult);
-        responseContainer.errormessage = "File operation error";
+        responseContainer.errormessage = "File operation kill error";
     }
     responseContainer.continuous = false;
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
@@ -460,6 +460,8 @@ uint32_t    CreateRequestFunc(MessageContainer* requestContainer)
     if (isDirectory(request->attribute))
     {
         Fresult = f_mkdir(request->path);
+        if (Fresult == FR_EXIST)
+            Fresult = FR_OK; //ingnore f_exist in directory create
     }
     else
     {
@@ -470,7 +472,7 @@ uint32_t    CreateRequestFunc(MessageContainer* requestContainer)
         {
             if (Semaphore_pend(FFS_Sem, BIOS_NO_WAIT))
             {
-                Fresult = f_open(UploadFileHandle,request->path,FA_CREATE_NEW);
+                Fresult = f_open(UploadFileHandle,request->path,FA_READ | FA_WRITE | FA_OPEN_ALWAYS | FA_CREATE_ALWAYS);
                 if (Fresult == FR_OK)
                 {
                     if (f_close (UploadFileHandle)!= FR_OK)
@@ -490,7 +492,8 @@ uint32_t    CreateRequestFunc(MessageContainer* requestContainer)
     if (Fresult != FR_OK)
     {
         //status = ERROR_CODE__FILE_NOT_FOUND;
-        usnprintf(ErrorMsg, 100, "File Operation failed error code %d",Fresult);
+        //usnprintf(ErrorMsg, 100, "File Operation failed error code %d",Fresult);
+        Report("File Operation failed error code", __FILE__, __LINE__, Fresult, RpWarning,   (int)0, 0);
 
     }
     free (UploadFileHandle);
@@ -500,7 +503,7 @@ uint32_t    CreateRequestFunc(MessageContainer* requestContainer)
     {
         responseContainer.has_error = true;
         responseContainer.error = getErrorCode(Fresult);
-        responseContainer.errormessage = "File operation error";
+        responseContainer.errormessage = "File operation create error";
     }
     responseContainer.continuous = false;
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
@@ -540,10 +543,10 @@ uint32_t    DeleteRequestFunc(MessageContainer* requestContainer)
     responseContainer = createContainer(MESSAGE_TYPE__DeleteResponse,  requestContainer->token, false, &response, &delete_response__pack, &delete_response__get_packed_size);
     if (Fresult!= OK)
     {
-        usnprintf(ErrorMsg, 100, "File Operation failed error code %d",Fresult);
+        //usnprintf(ErrorMsg, 100, "File Operation failed error code %d",Fresult);
         responseContainer.has_error = true;
         responseContainer.error = getErrorCode(Fresult);
-        responseContainer.errormessage = ErrorMsg;
+        responseContainer.errormessage = "File operation delete error";
     }
     responseContainer.continuous = false;
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
@@ -590,7 +593,7 @@ uint32_t    GetStorageInfoRequestFunc(MessageContainer* requestContainer)
     {
         responseContainer.has_error = true;
         responseContainer.error = getErrorCode(Fresult);
-        responseContainer.errormessage = "File operation error";
+        responseContainer.errormessage = "File operation get storage info error";
     }
     responseContainer.continuous = false;
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
@@ -719,7 +722,7 @@ uint32_t    GetFilesRequestFunc(MessageContainer* requestContainer)
     {
         responseContainer.has_error = true;
         responseContainer.error = getErrorCode(Fresult);
-        responseContainer.errormessage = "File operation error";
+        responseContainer.errormessage = "File operation get files error";
     }
     responseContainer.continuous = false;
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));