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

updating kernel like program fpga, execute command to print which module failed, unlinking temporary file while programming bug fix

Browse Source
This commit is contained in:
maliakal_d
2021-11-03 17:17:24 +01:00
parent 98cf908918
commit 6e49b77b08
14 changed files with 435 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/src/Module.h
View File

@ -541,6 +541,7 @@ class Module : public virtual slsDetectorDefs {
void resetFPGA();
void copyDetectorServer(const std::string &fname,
const std::string &hostname);
void updateKernel(std::vector<char> buffer);
void rebootController();
uint32_t readRegister(uint32_t addr) const;
uint32_t writeRegister(uint32_t addr, uint32_t val);
@ -565,7 +566,7 @@ class Module : public virtual slsDetectorDefs {
bool getLockDetector() const;
void setLockDetector(bool lock);
sls::IpAddr getLastClientIP() const;
std::string execCommand(const std::string &cmd);
std::string executeCommand(const std::string &cmd);
int64_t getNumberOfFramesFromStart() const;
int64_t getActualTime() const;
int64_t getMeasurementTime() const;
@ -748,6 +749,8 @@ class Module : public virtual slsDetectorDefs {
bool trimbits = true);
void programFPGAviaBlackfin(std::vector<char> buffer);
void programFPGAviaNios(std::vector<char> buffer);
void updateKernelviaBlackfin(std::vector<char> buffer);
void updateKernelviaNios(std::vector<char> buffer);
const int moduleIndex;
mutable sls::SharedMemory<sharedModule> shm{0, 0};