detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-12-13 08:30:04 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #1158 from slsdetectorgroup/dev/jf_timing_decoder_only_hw2.0
Some checks failed
CMake / Configure and build using cmake (push) Failing after 10s
Details

Browse Source 
get timin g info decoder not supported for jf 2.0
This commit is contained in:
maliakal_d
2025-03-18 12:35:23 +01:00
committed by GitHub
parent 3c2f149c22 7b531059a0
commit ce0450d498
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

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

@@ -10891,11 +10891,18 @@ int get_timing_info_decoder(int file_des) {
functionNotImplemented();
#else
// get only
ret = getTimingInfoDecoder(&retval);
LOG(logDEBUG1, ("retval timing info decoder: %d\n", retval));
if (ret == FAIL) {
strcpy(mess, "Could not get timing info decoder\n");
if (isHardwareVersion_1_0()) {
ret = FAIL;
sprintf(mess, "Could not get timing info decoder. Not supported "
"for hardware version 1.0\n");
LOG(logERROR, (mess));
} else {
ret = getTimingInfoDecoder(&retval);
LOG(logDEBUG1, ("retval timing info decoder: %d\n", retval));
if (ret == FAIL) {
strcpy(mess, "Could not get timing info decoder\n");
LOG(logERROR, (mess));
}
}
#endif
return Server_SendResult(file_des, INT32, &retval, sizeof(retval));

2
slsSupportLib/include/sls/versionAPI.h
View File

@@ -8,5 +8,5 @@
#define APIMYTHEN3 "developer 0x250310"
#define APIMOENCH "developer 0x250310"
#define APIEIGER "developer 0x250310"
#define APIJUNGFRAU "developer 0x250311"
#define APIXILINXCTB "developer 0x250311"
#define APIJUNGFRAU "developer 0x250318"