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

fix using real detectors, moving readconfig to end (due to initialization)

Browse Source
This commit is contained in:
maliakal_d
2020-05-11 19:26:22 +02:00
parent 6620027439
commit 5aaefc8e00
10 changed files with 1396 additions and 1335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
View File

@ -84,6 +84,9 @@ u_int16_t getHardwareSerialNumber();
#ifdef JUNGFRAUD
int isHardwareVersion2();
#endif
#ifdef EIGERD
void readDetectorNumber();
#endif
u_int32_t getDetectorNumber();
u_int64_t getDetectorMAC();
u_int32_t getDetectorIP();
@ -116,7 +119,7 @@ int setDefaultDacs();
int readConfigFile();
#endif
#ifdef EIGERD
int resetToHardwareSettings();
void resetToHardwareSettings();
#endif
// advanced read/write reg
@ -435,7 +438,8 @@ void setExternalGating(int enable[]);
int setAllTrimbits(int val);
int getAllTrimbits();
int getBebFPGATemp();
int activate(int enable);
int setActivate(int enable);
int getActivate(int* retval);
// gotthard specific - adc phase
#elif GOTTHARDD