detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 07:20:01 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' into j1.1fix

Browse Source
This commit is contained in:
maliakal_d 2021-10-07 16:41:02 +02:00
commit cfb604bbf4
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/src/Detector.cpp
View File

@ -2131,6 +2131,7 @@ void Detector::setAdditionalJsonParameter(const std::string &key,
void Detector::programFPGA(const std::string &fname, Positions pos) { void Detector::programFPGA(const std::string &fname, Positions pos) {
std::vector<char> buffer = pimpl->readProgrammingFile(fname); std::vector<char> buffer = pimpl->readProgrammingFile(fname);
pimpl->Parallel(&Module::programFPGA, pos, buffer); pimpl->Parallel(&Module::programFPGA, pos, buffer);
rebootController(pos);
} }
void Detector::resetFPGA(Positions pos) { void Detector::resetFPGA(Positions pos) {
@ -2153,7 +2154,6 @@ void Detector::updateFirmwareAndServer(const std::string &sname,
Positions pos) { Positions pos) {
pimpl->Parallel(&Module::copyDetectorServer, pos, sname, hostname); pimpl->Parallel(&Module::copyDetectorServer, pos, sname, hostname);
programFPGA(fname, pos); programFPGA(fname, pos);
rebootController(pos);
} }
Result<uint32_t> Detector::readRegister(uint32_t addr, Positions pos) const { Result<uint32_t> Detector::readRegister(uint32_t addr, Positions pos) const {

6
slsDetectorSoftware/src/Module.cpp
View File

@ -3490,12 +3490,7 @@ void Module::programFPGAviaBlackfin(std::vector<char> buffer) {
<< " returned error: " << client.readErrorMessage(); << " returned error: " << client.readErrorMessage();
throw RuntimeError(os.str()); throw RuntimeError(os.str());
} }
if (moduleIndex == 0) {
LOG(logINFO) << "Copied to flash and checksum verified";
}
LOG(logINFO) << "FPGA programmed successfully"; LOG(logINFO) << "FPGA programmed successfully";
rebootController();
} }
void Module::programFPGAviaNios(std::vector<char> buffer) { void Module::programFPGAviaNios(std::vector<char> buffer) {
@ -3573,6 +3568,5 @@ void Module::programFPGAviaNios(std::vector<char> buffer) {
throw RuntimeError(os.str()); throw RuntimeError(os.str());
} }
LOG(logINFO) << "FPGA programmed successfully"; LOG(logINFO) << "FPGA programmed successfully";
rebootController();
} }
} // namespace sls } // namespace sls