detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-16 14:57:13 +02:00
Code Issues Actions Packages Releases Activity

nios kernel update takes time, simulating

Browse Source
This commit is contained in:
maliakal_d
2021-11-09 16:05:47 +01:00
parent 0090c183bf
commit d9168803ae
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorSoftware/src/Module.cpp
View File

@ -3528,17 +3528,24 @@ void Module::sendProgram(bool blackfin, std::vector<char> buffer,
<< shm()->hostname << ")"; << shm()->hostname << ")";
// simulating erasing and writing to // simulating erasing and writing to
if (functionEnum == F_PROGRAM_FPGA) { if (blackfin) {
if (blackfin) { if (functionEnum == F_PROGRAM_FPGA) {
simulatingActivityinDetector("Erasing Flash", simulatingActivityinDetector("Erasing Flash",
BLACKFIN_ERASE_FLASH_TIME); BLACKFIN_ERASE_FLASH_TIME);
simulatingActivityinDetector("Writing to Flash", simulatingActivityinDetector("Writing to Flash",
BLACKFIN_WRITE_TO_FLASH_TIME); BLACKFIN_WRITE_TO_FLASH_TIME);
} else { }
} else {
if (functionEnum == F_PROGRAM_FPGA) {
simulatingActivityinDetector("Erasing Flash", simulatingActivityinDetector("Erasing Flash",
NIOS_ERASE_FLASH_TIME); NIOS_ERASE_FLASH_TIME_FPGA);
simulatingActivityinDetector("Writing to Flash", 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);
} }
} }

6
slsDetectorSoftware/src/Module.h
View File

@ -757,8 +757,10 @@ class Module : public virtual slsDetectorDefs {
mutable sls::SharedMemory<sharedModule> shm{0, 0}; mutable sls::SharedMemory<sharedModule> shm{0, 0};
static const int BLACKFIN_ERASE_FLASH_TIME = 65; static const int BLACKFIN_ERASE_FLASH_TIME = 65;
static const int BLACKFIN_WRITE_TO_FLASH_TIME = 30; static const int BLACKFIN_WRITE_TO_FLASH_TIME = 30;
static const int NIOS_ERASE_FLASH_TIME = 10; static const int NIOS_ERASE_FLASH_TIME_FPGA = 10;
static const int NIOS_WRITE_TO_FLASH_TIME = 45; 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 } // namespace sls