diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 2f3a61cfd..2a154698e 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index a7d923793..89d38f569 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -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)); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller.cpp b/slsDetectorSoftware/tests/Caller/test-Caller.cpp index c2235d81e..ae21ed945 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller.cpp @@ -3236,7 +3236,7 @@ TEST_CASE("reg", "[.cmdcall]") { addr = 0x80; } if (det_type == defs::GOTTHARD2) { - addr = 0x20; + addr = 0x298; } std::string saddr = ToStringHex(addr); auto prev_val = det.readRegister(addr); @@ -3292,7 +3292,7 @@ TEST_CASE("setbit", "[.cmdcall]") { addr = 0x80; } if (det_type == defs::GOTTHARD2) { - addr = 0x20; + addr = 0x298; } std::string saddr = ToStringHex(addr); auto prev_val = det.readRegister(addr); @@ -3322,7 +3322,7 @@ TEST_CASE("clearbit", "[.cmdcall]") { addr = 0x80; } if (det_type == defs::GOTTHARD2) { - addr = 0x20; + addr = 0x298; } std::string saddr = ToStringHex(addr); auto prev_val = det.readRegister(addr); @@ -3352,7 +3352,7 @@ TEST_CASE("getbit", "[.cmdcall]") { addr = 0x80; } if (det_type == defs::GOTTHARD2) { - addr = 0x20; + addr = 0x298; } std::string saddr = ToStringHex(addr); auto prev_val = det.readRegister(addr); diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 16ecdd976..acb17aaa1 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -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"