diff options
Diffstat (limited to 'Software/Embedded_SW/Embedded/Common/SWUpdate')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c | 4 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c index 35f336627..89039d2a6 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c @@ -102,11 +102,11 @@ uint32_t FileUploadRequestFunc(MessageContainer* requestContainer) CommRxTaskHandle = Task_self(); Task_setPri(CommRxTaskHandle, 3); // Report("Task_setPri", __FILE__, __LINE__, 4, RpWarning, (int)CommRxTaskHandle, 0); - Report("FileUploadRequestFunc 2", __FILE__, __LINE__, msec_millisecondCounter, RpWarning, (int)0, 0); + //Report("FileUploadRequestFunc 2", __FILE__, __LINE__, msec_millisecondCounter, RpWarning, (int)0, 0); Fresult = f_open(UploadFileHandle,request->path,FA_READ | FA_WRITE | FA_OPEN_ALWAYS | FA_CREATE_ALWAYS); if (Fresult == FR_OK) { - Report("FileUploadRequestFunc 3", __FILE__, __LINE__, msec_millisecondCounter, RpWarning, (int)0, 0); + //Report("FileUploadRequestFunc 3", __FILE__, __LINE__, msec_millisecondCounter, RpWarning, (int)0, 0); FileLength = request->length; FileReceivedLength = 0; REPORT_MSG (FileLength,"file upload request"); diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c index d7388a64b..e31eda646 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c @@ -83,7 +83,7 @@ uint32_t ActivateVersionCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag) if (Reboot == true) { LOG_ERROR(255,"Update successful, Rebooting in 5 seconds"); - Task_sleep (120000000*5); + Task_sleep (eOneSecond*5); Power_Reset(); } return OK; @@ -125,6 +125,7 @@ uint32_t ActivateVersionRequestFunc(MessageContainer* requestContainer) { VersionPackage = version_package_descriptor__unpack(NULL,Bytes,buffer); NumberOfFiles = VersionPackage->n_filedescriptors; + Report("ActivateVersionRequestFunc",__FILE__,__LINE__,(int)NumberOfFiles,RpWarning,Bytes,0); if (NumberOfFiles) { CurrentRunningFile = 0; @@ -157,7 +158,7 @@ uint32_t ActivateVersionRequestFunc(MessageContainer* requestContainer) usnprintf(FullPath, 50, "%s%s%s", request->path,"/", VersionPackage->filedescriptors[File_i]->filename); Fresult = f_unlink("//SYSINFO//EMBPARAM.CFG"); Fresult |= f_rename (FullPath, "//SYSINFO//EMBPARAM.CFG"); - LoadConfigurationParamsFromFile(true); + LoadConfigurationParamsFromFile(); CurrentRunningFile++; break; case VERSION_FILE_DESTINATION__ProcessParams: |