detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 03:10:02 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'g2speed' into fixtests

Browse Source
This commit is contained in:
maliakal_d 2021-10-08 11:57:49 +02:00
commit 5b7918f50e
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE.txt
View File

@ -254,7 +254,7 @@ This document describes the differences between 6.0.0 and 5.2.0 releases.
Eiger Eiger
===== =====
Compatible version : 08.09.2020 (v27) Compatible version : 08.10.2021 (v29)
Jungfrau Jungfrau
======== ========

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "sls/sls_detector_defs.h" #include "sls/sls_detector_defs.h"
#define REQUIRED_FIRMWARE_VERSION (27) #define REQUIRED_FIRMWARE_VERSION (29)
// virtual ones renamed for consistency // virtual ones renamed for consistency
// real ones keep previous name for compatibility (already in production) // real ones keep previous name for compatibility (already in production)
#ifdef VIRTUAL #ifdef VIRTUAL

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

@ -1,13 +1,13 @@
/** API versions */ /** API versions */
#define GITBRANCH "g2speed" #define GITBRANCH "g2speed"
#define APICTB 0x211007 #define APICTB 0x211007
#define APIGOTTHARD 0x211007 #define APIGOTTHARD 0x211007
#define APIMYTHEN3 0x211007 #define APIMYTHEN3 0x211007
#define APIMOENCH 0x211005 #define APIMOENCH 0x211005
#define APIEIGER 0x211007
#define APILIB 0x211007 #define APILIB 0x211007
#define APIRECEIVER 0x211007 #define APIRECEIVER 0x211007
#define APIGUI 0x210819 #define APIGUI 0x210819
#define APIJUNGFRAU 0x211008 #define APIJUNGFRAU 0x211008
#define APIGOTTHARD2 0x211008 #define APIGOTTHARD2 0x211008
#define APIEIGER 0x211008

8
slsSupportLib/tests/test-ToString.cpp
View File

@ -338,14 +338,14 @@ TEST_CASE("speedLevel to string"){
REQUIRE(ToString(sls::defs::speedLevel::FULL_SPEED) == "full_speed"); REQUIRE(ToString(sls::defs::speedLevel::FULL_SPEED) == "full_speed");
REQUIRE(ToString(sls::defs::speedLevel::HALF_SPEED) == "half_speed"); REQUIRE(ToString(sls::defs::speedLevel::HALF_SPEED) == "half_speed");
REQUIRE(ToString(sls::defs::speedLevel::QUARTER_SPEED) == "quarter_speed"); REQUIRE(ToString(sls::defs::speedLevel::QUARTER_SPEED) == "quarter_speed");
REQUIRE(ToString(sls::defs::speedLevel::G_108MHZ) == "108"); REQUIRE(ToString(sls::defs::speedLevel::G2_108MHZ) == "108");
REQUIRE(ToString(sls::defs::speedLevel::G_144MHZ) == "144"); REQUIRE(ToString(sls::defs::speedLevel::G2_144MHZ) == "144");
} }
TEST_CASE("string to speedLevel"){ TEST_CASE("string to speedLevel"){
REQUIRE(StringTo<sls::defs::speedLevel>("full_speed") == sls::defs::speedLevel::FULL_SPEED); REQUIRE(StringTo<sls::defs::speedLevel>("full_speed") == sls::defs::speedLevel::FULL_SPEED);
REQUIRE(StringTo<sls::defs::speedLevel>("half_speed") == sls::defs::speedLevel::HALF_SPEED); REQUIRE(StringTo<sls::defs::speedLevel>("half_speed") == sls::defs::speedLevel::HALF_SPEED);
REQUIRE(StringTo<sls::defs::speedLevel>("quarter_speed") == sls::defs::speedLevel::QUARTER_SPEED); REQUIRE(StringTo<sls::defs::speedLevel>("quarter_speed") == sls::defs::speedLevel::QUARTER_SPEED);
REQUIRE(StringTo<sls::defs::speedLevel>("108") == sls::defs::speedLevel::G_108MHZ); REQUIRE(StringTo<sls::defs::speedLevel>("108") == sls::defs::speedLevel::G2_108MHZ);
REQUIRE(StringTo<sls::defs::speedLevel>("144") == sls::defs::speedLevel::G_144MHZ); REQUIRE(StringTo<sls::defs::speedLevel>("144") == sls::defs::speedLevel::G2_144MHZ);
} }