diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index eb8453445..4cbf3e587 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 7c709d39e..44b60a913 100755 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -3941,7 +3941,7 @@ int power_chip(int file_des) { return printSocketReadError(); FILE_LOG(logDEBUG1, ("Powering chip to %d\n", arg)); -#if !defined(JUNGFRAUD) && !defined(MOENCHD) && !defined(MYTHEN3D) && !defined(GOTTHARD2D) +#if !defined(JUNGFRAUD) && !defined(MYTHEN3D) && !defined(GOTTHARD2D) functionNotImplemented(); #else // set & get diff --git a/slsDetectorSoftware/include/Detector.h b/slsDetectorSoftware/include/Detector.h index 8cbe0cd55..232665467 100644 --- a/slsDetectorSoftware/include/Detector.h +++ b/slsDetectorSoftware/include/Detector.h @@ -238,10 +238,10 @@ class Detector { Result getHighVoltage(Positions pos = {}) const; - /** [Jungfrau][Mythen3][Gotthard2] */ + /** [Jungfrau][Mythen3][Gotthard2][Moench] */ Result getPowerChip(Positions pos = {}) const; - /** [Jungfrau][Mythen3][Gotthard2] */ + /** [Jungfrau][Mythen3][Gotthard2][Moench] */ void setPowerChip(bool on, Positions pos = {}); /** diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h index 2c83f5679..ac88c4154 100644 --- a/slsDetectorSoftware/src/CmdProxy.h +++ b/slsDetectorSoftware/src/CmdProxy.h @@ -1081,7 +1081,7 @@ class CmdProxy { "\n\t[Jungfrau][Ctb][Moench] [0|60-200]"); INTEGER_COMMAND(powerchip, getPowerChip, setPowerChip, std::stoi, - "[0, 1]\n\t[Jungfrau][Mythen3][Gotthard2] Power the chip. Default 0." + "[0, 1]\n\t[Jungfrau][Mythen3][Gotthard2][Moench] Power the chip. Default 0." "\n\t[Jungfrau] Get will return power status." "Can be off if temperature event occured (temperature over temp_threshold with temp_control enabled." "\n\t[Mythen3] If module not connected or wrong module, 1 will fail. By default, not powered on" diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index faec70571..c555294c7 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -8,5 +8,5 @@ #define APIRECEIVER 0x200227 #define APIGUI 0x200227 #define APICTB 0x200227 -#define APIMOENCH 0x200303 #define APIGOTTHARD2 0x200304 +#define APIMOENCH 0x200304