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

j: 1. chipversion

Browse Source
This commit is contained in:
maliakal_d
2021-07-22 16:48:35 +02:00
parent da4d47052d
commit cb293f9945
16 changed files with 190 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,6 +87,7 @@ u_int16_t getHardwareSerialNumber();
#endif
#ifdef JUNGFRAUD
int isHardwareVersion2();
int getChipVersion();
#endif
#if defined(EIGERD) || defined(MYTHEN3D)
void readDetectorNumber();
@ -122,7 +123,7 @@ int setDefaultDacs();
void setASICDefaults();
void setADIFDefaults();
#endif
#if defined(GOTTHARD2D) || defined(EIGERD)
#if defined(GOTTHARD2D) || defined(EIGERD) || defined(JUNGFRAUD)
int readConfigFile();
#endif
#ifdef EIGERD

1
slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h
View File

@ -253,3 +253,4 @@ int get_veto_stream(int);
int set_veto_stream(int);
int get_veto_algorithm(int);
int set_veto_algorithm(int);
int get_chip_version(int);

14
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -379,6 +379,7 @@ void function_table() {
flist[F_SET_VETO_STREAM] = &set_veto_stream;
flist[F_GET_VETO_ALGORITHM] = &get_veto_algorithm;
flist[F_SET_VETO_ALGORITHM] = &set_veto_algorithm;
flist[F_GET_CHIP_VERSION] = &get_chip_version;
// check
if (NUM_DET_FUNCTIONS >= RECEIVER_ENUM_START) {
@ -8432,4 +8433,17 @@ int set_veto_algorithm(int file_des) {
}
#endif
return Server_SendResult(file_des, INT32, NULL, 0);
}
int get_chip_version(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
int retval = -1;
#ifndef JUNGFRAUD
functionNotImplemented();
#else
retval = getChipVersion();
#endif
LOG(logDEBUG1, ("chip version retval: %d\n", retval));
return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
}