diff --git a/RELEASE.txt b/RELEASE.txt index 037f87427..bd79956a6 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -254,7 +254,7 @@ This document describes the differences between 6.0.0 and 5.2.0 releases. Eiger ===== - Compatible version : 08.09.2020 (v27) + Compatible version : 08.10.2021 (v29) Jungfrau ======== diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer index b0eb864d4..f9c85fa46 100755 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h index 125891d14..39cbe9294 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h @@ -1,7 +1,7 @@ #pragma once #include "sls/sls_detector_defs.h" -#define REQUIRED_FIRMWARE_VERSION (27) +#define REQUIRED_FIRMWARE_VERSION (29) // virtual ones renamed for consistency // real ones keep previous name for compatibility (already in production) #ifdef VIRTUAL diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index bbb25747c..79b341b20 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -1,13 +1,13 @@ /** API versions */ #define GITBRANCH "g2speed" - #define APICTB 0x211007 #define APIGOTTHARD 0x211007 #define APIMYTHEN3 0x211007 #define APIMOENCH 0x211005 -#define APIEIGER 0x211007 #define APILIB 0x211007 #define APIRECEIVER 0x211007 #define APIGUI 0x210819 #define APIJUNGFRAU 0x211008 #define APIGOTTHARD2 0x211008 + +#define APIEIGER 0x211008 diff --git a/slsSupportLib/tests/test-ToString.cpp b/slsSupportLib/tests/test-ToString.cpp index 41b510455..306e5eada 100644 --- a/slsSupportLib/tests/test-ToString.cpp +++ b/slsSupportLib/tests/test-ToString.cpp @@ -338,14 +338,14 @@ TEST_CASE("speedLevel to string"){ REQUIRE(ToString(sls::defs::speedLevel::FULL_SPEED) == "full_speed"); REQUIRE(ToString(sls::defs::speedLevel::HALF_SPEED) == "half_speed"); REQUIRE(ToString(sls::defs::speedLevel::QUARTER_SPEED) == "quarter_speed"); - REQUIRE(ToString(sls::defs::speedLevel::G_108MHZ) == "108"); - REQUIRE(ToString(sls::defs::speedLevel::G_144MHZ) == "144"); + REQUIRE(ToString(sls::defs::speedLevel::G2_108MHZ) == "108"); + REQUIRE(ToString(sls::defs::speedLevel::G2_144MHZ) == "144"); } TEST_CASE("string to speedLevel"){ REQUIRE(StringTo("full_speed") == sls::defs::speedLevel::FULL_SPEED); REQUIRE(StringTo("half_speed") == sls::defs::speedLevel::HALF_SPEED); REQUIRE(StringTo("quarter_speed") == sls::defs::speedLevel::QUARTER_SPEED); - REQUIRE(StringTo("108") == sls::defs::speedLevel::G_108MHZ); - REQUIRE(StringTo("144") == sls::defs::speedLevel::G_144MHZ); + REQUIRE(StringTo("108") == sls::defs::speedLevel::G2_108MHZ); + REQUIRE(StringTo("144") == sls::defs::speedLevel::G2_144MHZ); } \ No newline at end of file