diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 393f0753a..70c0fec94 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index ca094263d..a23be7a45 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -449,6 +449,7 @@ void initControlServer() { void initStopServer() { if (!updateFlag && initError == OK) { usleep(CTRL_SRVR_INIT_TIME_US); + LOG(logINFOBLUE, ("Configuring Stop server\n")); if (mapCSP0() == FAIL) { initError = FAIL; strcpy(initErrorMessage, @@ -458,7 +459,7 @@ void initStopServer() { return; } #ifdef VIRTUAL - sharedMemory_setStop(0); + setupDetector(); #endif } initCheckDone = 1; @@ -512,10 +513,16 @@ void setupDetector() { ndSamples = 1; ntSamples = 1; #ifdef VIRTUAL - sharedMemory_setStatus(IDLE); - initializePatternWord(); + if (isControlServer) { + sharedMemory_setStatus(IDLE); + initializePatternWord(); + } else { + sharedMemory_setStop(0); + } #endif - setupUDPCommParameters(); + if (isControlServer) { + setupUDPCommParameters(); + } // altera pll ALTERA_PLL_SetDefines(PLL_CNTRL_REG, PLL_PARAM_REG, diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer index 333c4a93b..f70e30951 100755 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c index ad9b875f7..7dff925be 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -379,63 +379,7 @@ void initControlServer() { return; } #ifndef VIRTUAL - sharedMemory_lockLocalLink(); - Feb_Interface_FebInterface(); - if (!Feb_Control_FebControl(normal)) { - initError = FAIL; - sprintf(initErrorMessage, - "Could not intitalize eiger detector sever: feb control\n"); - LOG(logERROR, (initErrorMessage)); - initCheckDone = 1; - sharedMemory_unlockLocalLink(); - return; - } - if (Feb_Control_SetMasterEffects(master, isControlServer) == FAIL) { - initError = FAIL; - sprintf(initErrorMessage, "Could not intitalize HV for eiger " - "detector server: feb control serial " - "communication\n"); - LOG(logERROR, (initErrorMessage)); - initCheckDone = 1; - sharedMemory_unlockLocalLink(); - return; - } - sharedMemory_unlockLocalLink(); - LOG(logDEBUG1, ("Control server: FEB Initialization done\n")); - Beb_SetTopVariable(top); - Beb_Beb(); - LOG(logDEBUG1, ("Control server: BEB Initialization done\n")); - - // Getting the feb versions after initialization - char hversion[MAX_STR_LENGTH] = {0}; - memset(hversion, 0, MAX_STR_LENGTH); - getHardwareVersion(hversion); - int64_t fwversion = getFirmwareVersion(); - int64_t feblfwversion = getFrontEndFirmwareVersion(FRONT_LEFT); - int64_t febrfwversion = getFrontEndFirmwareVersion(FRONT_RIGHT); - LOG(logINFOBLUE, - ("\n********************************************************\n" - "Feb Versions\n" - "Hardware Version : %s\n" - "Firmware (Febl) Version : %lld\n" - "Firmware (Febr) Version : %lld\n" - "********************************************************\n", - hversion, (long long int)feblfwversion, - (long long int)febrfwversion)); - - // ensure febl, febr and beb fw versions are the same - if (fwversion != feblfwversion || fwversion != febrfwversion) { - sprintf( - initErrorMessage, - "Inconsistent firmware versions in feb and beb. [Beb: %lld, " - "Febl: %lld Febr: %lld]\n", - (long long int)fwversion, (long long int)feblfwversion, - (long long int)febrfwversion); - LOG(logERROR, (initErrorMessage)); - initError = FAIL; - return; - } - + setupFebBeb(); #endif // also reads config file and deactivates setupDetector(); @@ -449,56 +393,22 @@ void initStopServer() { // command line) usleep(WAIT_STOP_SERVER_START); LOG(logINFOBLUE, ("Configuring Stop server\n")); + // ismaster from variable in stop server if (updateModuleConfiguration() == FAIL) { initCheckDone = 1; return; } #ifdef VIRTUAL - sharedMemory_setStop(0); - // force top or master if in config file - if (readConfigFile() == FAIL) { - initCheckDone = 1; - return; - } - // force top or master if in command line - if (checkCommandLineConfiguration() == FAIL) { - initCheckDone = 1; - return; - } + setupDetector(); #else - // control server read config file and already set up master/top - sharedMemory_lockLocalLink(); - Feb_Interface_FebInterface(); - if (!Feb_Control_FebControl(normal)) { - initError = FAIL; - sprintf(initErrorMessage, "Could not intitalize feb control\n"); - LOG(logERROR, (initErrorMessage)); - initCheckDone = 1; - sharedMemory_unlockLocalLink(); - return; - } - if (Feb_Control_SetMasterEffects(master, isControlServer) == FAIL) { - initError = FAIL; - sprintf(initErrorMessage, "Could not intitalize HV for eiger " - "detector server: feb control serial " - "communication\n"); - LOG(logERROR, (initErrorMessage)); - initCheckDone = 1; - sharedMemory_unlockLocalLink(); - return; - } - sharedMemory_unlockLocalLink(); - LOG(logDEBUG1, ("Stop server: FEB Initialization done\n")); - Beb_SetTopVariable(top); - Beb_Beb(); - LOG(logDEBUG1, ("Control server: BEB Initialization done\n")); -#endif + setupFebBeb(); // client first connect (from shm) will activate if (setActivate(0) == FAIL) { initError = FAIL; strcpy(initErrorMessage, "Could not deactivate\n"); LOG(logERROR, (initErrorMessage)); } +#endif } initCheckDone = 1; } @@ -749,6 +659,71 @@ int checkCommandLineConfiguration() { /* set up detector */ +#ifndef VIRTUAL +void setupFebBeb() { + sharedMemory_lockLocalLink(); + Feb_Interface_FebInterface(); + if (!Feb_Control_FebControl(normal)) { + initError = FAIL; + sprintf(initErrorMessage, + "Could not intitalize eiger detector sever: feb control\n"); + LOG(logERROR, (initErrorMessage)); + initCheckDone = 1; + sharedMemory_unlockLocalLink(); + return; + } + if (Feb_Control_SetMasterEffects(master, isControlServer) == FAIL) { + initError = FAIL; + sprintf(initErrorMessage, "Could not intitalize HV for eiger " + "detector server: feb control serial " + "communication\n"); + LOG(logERROR, (initErrorMessage)); + initCheckDone = 1; + sharedMemory_unlockLocalLink(); + return; + } + sharedMemory_unlockLocalLink(); + LOG(logDEBUG1, ("%s server: FEB Initialization done\n", + isControlServer ? "Control" : "Stop")); + Beb_SetTopVariable(top); + Beb_Beb(); + LOG(logDEBUG1, ("%s server: BEB Initialization done\n", + isControlServer ? "Control" : "Stop")); + + if (isControlServer) { + // Getting the feb versions after initialization + char hversion[MAX_STR_LENGTH] = {0}; + memset(hversion, 0, MAX_STR_LENGTH); + getHardwareVersion(hversion); + int64_t fwversion = getFirmwareVersion(); + int64_t feblfwversion = getFrontEndFirmwareVersion(FRONT_LEFT); + int64_t febrfwversion = getFrontEndFirmwareVersion(FRONT_RIGHT); + LOG(logINFOBLUE, + ("\n********************************************************\n" + "Feb Versions\n" + "Hardware Version : %s\n" + "Firmware (Febl) Version : %lld\n" + "Firmware (Febr) Version : %lld\n" + "********************************************************\n", + hversion, (long long int)feblfwversion, + (long long int)febrfwversion)); + + // ensure febl, febr and beb fw versions are the same + if (fwversion != feblfwversion || fwversion != febrfwversion) { + sprintf( + initErrorMessage, + "Inconsistent firmware versions in feb and beb. [Beb: %lld, " + "Febl: %lld Febr: %lld]\n", + (long long int)fwversion, (long long int)feblfwversion, + (long long int)febrfwversion); + LOG(logERROR, (initErrorMessage)); + initError = FAIL; + return; + } + } +} +#endif + void allocateDetectorStructureMemory() { LOG(logINFO, ("This Server is for 1 Eiger half module (250k)\n\n")); @@ -799,8 +774,12 @@ void setupDetector() { LOG(logINFOBLUE, ("Setting Default Parameters\n")); resetToDefaultDacs(0); #ifdef VIRTUAL - sharedMemory_setStatus(IDLE); - setupUDPCommParameters(); + if (isControlServer) { + sharedMemory_setStatus(IDLE); + setupUDPCommParameters(); + } else { + sharedMemory_setStop(0); + } #endif // setting default measurement parameters diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index 4dd91e5de..3d192f089 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c index f53bbc07d..7038591e4 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c @@ -403,13 +403,7 @@ void initStopServer() { return; } #ifdef VIRTUAL - sharedMemory_setStop(0); - setMaster(OW_MASTER); - if (readConfigFile() == FAIL || - checkCommandLineConfiguration() == FAIL) { - initCheckDone = 1; - return; - } + setupDetector(); #endif } initCheckDone = 1; @@ -460,8 +454,14 @@ void setupDetector() { memset(vetoGainIndices, 0, sizeof(vetoGainIndices)); memset(adcConfiguration, 0, sizeof(adcConfiguration)); #ifdef VIRTUAL - sharedMemory_setStatus(IDLE); - setupUDPCommParameters(); + if (isControlServer) { + sharedMemory_setStatus(IDLE); + setupUDPCommParameters(); + } else { + sharedMemory_setStop(0); + } + // ismaster from reg in stop server, so set it in virtual mode + setMaster(OW_MASTER); #endif // pll defines ALTERA_PLL_C10_SetDefines(REG_OFFSET, BASE_READOUT_PLL, BASE_SYSTEM_PLL, @@ -2159,7 +2159,6 @@ int *getDetectorPosition() { return detPos; } int checkDetectorType(char *mess) { #ifdef VIRTUAL - setMaster(OW_MASTER); return OK; #endif LOG(logINFO, ("Checking module type\n")); diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h index edd0f6c62..de229932a 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h @@ -14,7 +14,11 @@ #define LINKED_SERVER_NAME "gotthard2DetectorServer" +#ifdef VIRTUAL +#define CTRL_SRVR_INIT_TIME_US (3 * 1000 * 1000) +#else #define CTRL_SRVR_INIT_TIME_US (300 * 1000) +#endif /* Hardware Definitions */ #define NCHAN (128) diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer index fc95ba9f8..e0cb8f816 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer differ diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c index 67894579b..43486f24a 100644 --- a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c @@ -388,14 +388,15 @@ void initStopServer() { return; } #ifdef VIRTUAL - sharedMemory_setStop(0); -#endif - // to get master from file + setupDetector(); +#else + // ismaster from variable in stop server if (readConfigFile() == FAIL || checkCommandLineConfiguration() == FAIL) { initCheckDone = 1; return; } +#endif } initCheckDone = 1; } @@ -406,8 +407,12 @@ void setupDetector() { LOG(logINFO, ("This Server is for 1 Gotthard module (1280 channels)\n")); #ifdef VIRTUAL - sharedMemory_setStatus(IDLE); - setupUDPCommParameters(); + if (isControlServer) { + sharedMemory_setStatus(IDLE); + setupUDPCommParameters(); + } else { + sharedMemory_setStop(0); + } #endif // Initialization diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h index c81c2325c..ad46b59ac 100644 --- a/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h @@ -12,7 +12,11 @@ #define LINKED_SERVER_NAME "gotthardDetectorServer" +#ifdef VIRTUAL +#define CTRL_SRVR_INIT_TIME_US (2 * 1000 * 1000) +#else #define CTRL_SRVR_INIT_TIME_US (300 * 1000) +#endif /* Enums */ enum ADCINDEX { TEMP_FPGA, TEMP_ADC }; diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 1e3275b24..19644fc9c 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c index 04ff1a3f8..18ce8cebb 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -439,15 +439,14 @@ void initStopServer() { initCheckDone = 1; return; } +#ifdef VIRTUAL + setupDetector(); +#else + // chip version is a variable if (readConfigFile() == FAIL) { initCheckDone = 1; return; } -#ifdef VIRTUAL - sharedMemory_setStop(0); - // temp threshold and reset event (read by stop server) - setThresholdTemperature(DEFAULT_TMP_THRSHLD); - setTemperatureEvent(0); #endif } initCheckDone = 1; @@ -463,8 +462,14 @@ void setupDetector() { } chipConfigured = 0; #ifdef VIRTUAL - sharedMemory_setStatus(IDLE); - setupUDPCommParameters(); + if (isControlServer) { + sharedMemory_setStatus(IDLE); + setupUDPCommParameters(); + } else { + sharedMemory_setStop(0); + } + // ismaster from reg in stop server, so set it in virtual mode + setMaster(OW_MASTER); #endif // altera pll diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h index 2d0033822..b844694fc 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h @@ -17,7 +17,11 @@ #define ID_FILE "detid_jungfrau.txt" #define LINKED_SERVER_NAME "jungfrauDetectorServer" +#ifdef VIRTUAL +#define CTRL_SRVR_INIT_TIME_US (4 * 1000 * 1000) +#else #define CTRL_SRVR_INIT_TIME_US (300 * 1000) +#endif /* Hardware Definitions */ #define NCHAN (256 * 256) diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index 3a7336a30..19e10f02b 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c index 19f2d6c98..151f718e0 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c @@ -420,10 +420,7 @@ void initStopServer() { return; } #ifdef VIRTUAL - sharedMemory_setStop(0); - // temp threshold and reset event (read by stop server) - setThresholdTemperature(DEFAULT_TMP_THRSHLD); - setTemperatureEvent(0); + setupDetector(); #endif } initCheckDone = 1; @@ -438,8 +435,14 @@ void setupDetector() { clkPhase[i] = 0; } #ifdef VIRTUAL - sharedMemory_setStatus(IDLE); - setupUDPCommParameters(); + if (isControlServer) { + sharedMemory_setStatus(IDLE); + setupUDPCommParameters(); + } else { + sharedMemory_setStop(0); + } + // ismaster from reg in stop server, so set it in virtual mode + setMaster(OW_MASTER); #endif // altera pll diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h index b564f21af..aa4133d7a 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h @@ -16,7 +16,11 @@ #define ID_FILE ("detid_moench.txt") #define LINKED_SERVER_NAME "moenchDetectorServer" +#ifdef VIRTUAL +#define CTRL_SRVR_INIT_TIME_US (2 * 1000 * 1000) +#else #define CTRL_SRVR_INIT_TIME_US (300 * 1000) +#endif /* Hardware Definitions */ #define NCHAN (400 * 400) diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index c879e7748..e162633cb 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c index 03d6a2d9e..f9b8fcd72 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c @@ -396,11 +396,7 @@ void initStopServer() { return; } #ifdef VIRTUAL - sharedMemory_setStop(0); - if (checkCommandLineConfiguration() == FAIL) { - initCheckDone = 1; - return; - } + setupDetector(); #endif } initCheckDone = 1; @@ -466,8 +462,12 @@ void setupDetector() { clkPhase[i] = 0; } #ifdef VIRTUAL - sharedMemory_setStatus(IDLE); - setupUDPCommParameters(); + if (isControlServer) { + sharedMemory_setStatus(IDLE); + setupUDPCommParameters(); + } else { + sharedMemory_setStop(0); + } #endif // pll defines diff --git a/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h b/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h index 985c1bdb1..06192e238 100644 --- a/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h +++ b/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h @@ -136,6 +136,9 @@ void checkVirtual9MFlag(); #endif // set up detector +#if defined(EIGERD) && !defined(VIRTUAL) +void setupFebBeb(); +#endif #if defined(EIGERD) || defined(MYTHEN3D) void allocateDetectorStructureMemory(); #endif diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer index 1428e465c..1bac8e709 100755 Binary files a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer and b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer differ diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp index 8ef02e85e..4b44a95c7 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp @@ -1043,10 +1043,10 @@ TEST_CASE("CALLER::v_a", "[.cmdcall]") { auto prev_val = det.getPower(defs::V_POWER_A); { std::ostringstream oss1, oss2; - caller.call("v_a", {"700"}, -1, PUT, oss1); - REQUIRE(oss1.str() == "v_a 700\n"); + caller.call("v_a", {"1200"}, -1, PUT, oss1); + REQUIRE(oss1.str() == "v_a 1200\n"); caller.call("v_a", {}, -1, GET, oss2); - REQUIRE(oss2.str() == "v_a 700\n"); + REQUIRE(oss2.str() == "v_a 1200\n"); } for (int i = 0; i != det.size(); ++i) { det.setPower(defs::V_POWER_A, prev_val[i], {i}); @@ -1065,10 +1065,10 @@ TEST_CASE("CALLER::v_b", "[.cmdcall]") { auto prev_val = det.getPower(defs::V_POWER_B); { std::ostringstream oss1, oss2; - caller.call("v_b", {"700"}, -1, PUT, oss1); - REQUIRE(oss1.str() == "v_b 700\n"); + caller.call("v_b", {"1200"}, -1, PUT, oss1); + REQUIRE(oss1.str() == "v_b 1200\n"); caller.call("v_b", {}, -1, GET, oss2); - REQUIRE(oss2.str() == "v_b 700\n"); + REQUIRE(oss2.str() == "v_b 1200\n"); } for (int i = 0; i != det.size(); ++i) { det.setPower(defs::V_POWER_B, prev_val[i], {i}); @@ -1087,10 +1087,10 @@ TEST_CASE("CALLER::v_c", "[.cmdcall]") { auto prev_val = det.getPower(defs::V_POWER_C); { std::ostringstream oss1, oss2; - caller.call("v_c", {"700"}, -1, PUT, oss1); - REQUIRE(oss1.str() == "v_c 700\n"); + caller.call("v_c", {"1200"}, -1, PUT, oss1); + REQUIRE(oss1.str() == "v_c 1200\n"); caller.call("v_c", {}, -1, GET, oss2); - REQUIRE(oss2.str() == "v_c 700\n"); + REQUIRE(oss2.str() == "v_c 1200\n"); } for (int i = 0; i != det.size(); ++i) { det.setPower(defs::V_POWER_C, prev_val[i], {i}); @@ -1109,10 +1109,10 @@ TEST_CASE("CALLER::v_d", "[.cmdcall]") { auto prev_val = det.getPower(defs::V_POWER_D); { std::ostringstream oss1, oss2; - caller.call("v_d", {"700"}, -1, PUT, oss1); - REQUIRE(oss1.str() == "v_d 700\n"); + caller.call("v_d", {"1200"}, -1, PUT, oss1); + REQUIRE(oss1.str() == "v_d 1200\n"); caller.call("v_d", {}, -1, GET, oss2); - REQUIRE(oss2.str() == "v_d 700\n"); + REQUIRE(oss2.str() == "v_d 1200\n"); } for (int i = 0; i != det.size(); ++i) { det.setPower(defs::V_POWER_D, prev_val[i], {i}); diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index c69f5b548..abf057750 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -4,11 +4,11 @@ #define RELEASE "developer" #define APILIB "developer 0x230224" #define APIRECEIVER "developer 0x230224" -#define APICTB "developer 0x240820" -#define APIGOTTHARD "developer 0x240820" -#define APIGOTTHARD2 "developer 0x240820" -#define APIMYTHEN3 "developer 0x240820" -#define APIMOENCH "developer 0x240820" -#define APIEIGER "developer 0x240820" -#define APIXILINXCTB "developer 0x240820" -#define APIJUNGFRAU "developer 0x240822" +#define APICTB "developer 0x240822" +#define APIGOTTHARD "developer 0x240822" +#define APIGOTTHARD2 "developer 0x240822" +#define APIMYTHEN3 "developer 0x240822" +#define APIMOENCH "developer 0x240822" +#define APIXILINXCTB "developer 0x240822" +#define APIEIGER "developer 0x240822" +#define APIJUNGFRAU "developer 0x240822"