From d9168803aebedba2a017e2f26a663578d0fa091d Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 9 Nov 2021 16:05:47 +0100 Subject: [PATCH] nios kernel update takes time, simulating --- slsDetectorSoftware/src/Module.cpp | 17 ++++++++++++----- slsDetectorSoftware/src/Module.h | 6 ++++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp index 444f24848..4aec5b5d5 100644 --- a/slsDetectorSoftware/src/Module.cpp +++ b/slsDetectorSoftware/src/Module.cpp @@ -3528,17 +3528,24 @@ void Module::sendProgram(bool blackfin, std::vector buffer, << shm()->hostname << ")"; // simulating erasing and writing to - if (functionEnum == F_PROGRAM_FPGA) { - if (blackfin) { + if (blackfin) { + if (functionEnum == F_PROGRAM_FPGA) { simulatingActivityinDetector("Erasing Flash", BLACKFIN_ERASE_FLASH_TIME); simulatingActivityinDetector("Writing to Flash", BLACKFIN_WRITE_TO_FLASH_TIME); - } else { + } + } else { + if (functionEnum == F_PROGRAM_FPGA) { simulatingActivityinDetector("Erasing Flash", - NIOS_ERASE_FLASH_TIME); + NIOS_ERASE_FLASH_TIME_FPGA); simulatingActivityinDetector("Writing to Flash", - NIOS_WRITE_TO_FLASH_TIME); + NIOS_WRITE_TO_FLASH_TIME_FPGA); + } else if (functionEnum == F_UPDATE_KERNEL) { + simulatingActivityinDetector("Erasing Flash", + NIOS_ERASE_FLASH_TIME_KERNEL); + simulatingActivityinDetector("Writing to Flash", + NIOS_WRITE_TO_FLASH_TIME_KERNEL); } } diff --git a/slsDetectorSoftware/src/Module.h b/slsDetectorSoftware/src/Module.h index 00c4cf115..28118c95b 100644 --- a/slsDetectorSoftware/src/Module.h +++ b/slsDetectorSoftware/src/Module.h @@ -757,8 +757,10 @@ class Module : public virtual slsDetectorDefs { mutable sls::SharedMemory shm{0, 0}; static const int BLACKFIN_ERASE_FLASH_TIME = 65; static const int BLACKFIN_WRITE_TO_FLASH_TIME = 30; - static const int NIOS_ERASE_FLASH_TIME = 10; - static const int NIOS_WRITE_TO_FLASH_TIME = 45; + static const int NIOS_ERASE_FLASH_TIME_FPGA = 10; + static const int NIOS_WRITE_TO_FLASH_TIME_FPGA = 45; + static const int NIOS_ERASE_FLASH_TIME_FPGA = 9; + static const int NIOS_WRITE_TO_FLASH_TIME_FPGA = 39; }; } // namespace sls \ No newline at end of file