diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-02 14:45:56 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-02 14:45:56 +0200 |
| commit | e85cef461f9df5cd23aab2044e97dd89bbcd9627 (patch) | |
| tree | a6e74e7ab0cd93f18cb4269706a75051794f5336 /Software/Embedded_SW | |
| parent | 6eab4de02492bac0afdc371c03cf062fad2ad28c (diff) | |
| download | Tango-e85cef461f9df5cd23aab2044e97dd89bbcd9627.tar.gz Tango-e85cef461f9df5cd23aab2044e97dd89bbcd9627.zip | |
fix fpga update
Diffstat (limited to 'Software/Embedded_SW')
4 files changed, 8 insertions, 5 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: diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/FPGA_Programming_Up.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/FPGA_Programming_Up.c index 00f4d73d6..04a52a6af 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/FPGA_Programming_Up.c +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/FPGA_Programming_Up.c @@ -101,6 +101,8 @@ FRESULT FPGA_Programming_Up(FPGA_ID FPGA_Id, char * FullPath, bool IncludeReboot HeatersEnd(); fresult = main_vme(); CurrentRunningFile++; + Report(FullPath,__FILE__,__LINE__,CurrentRunningFile,RpWarning,1,0); + } diff --git a/Software/Embedded_SW/Embedded/Embedded.cfg b/Software/Embedded_SW/Embedded/Embedded.cfg index fca3623c6..195dd3e15 100644 --- a/Software/Embedded_SW/Embedded/Embedded.cfg +++ b/Software/Embedded_SW/Embedded/Embedded.cfg @@ -105,7 +105,7 @@ Program.global.millisec = Task.create("&MillisecTask", MillisecTaskParams); var FPGALoad = new Task.Params(); FPGALoad.instance.name = "FPGALoad"; FPGALoad.stackSize = 4096; -FPGALoad.priority = 5; +FPGALoad.priority = 4; Program.global.FPGALoad = Task.create("&FPGALoadTask", FPGALoad); var I2C_Reading = new Task.Params(); |