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

moench: allow power chip

Browse Source
This commit is contained in:
maliakal_d 2020-03-04 10:41:10 +01:00
parent 1b996d1703
commit 7859cf78e9
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -3941,7 +3941,7 @@ int power_chip(int file_des) {
return printSocketReadError(); return printSocketReadError();
FILE_LOG(logDEBUG1, ("Powering chip to %d\n", arg)); 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(); functionNotImplemented();
#else #else
// set & get // set & get

4
slsDetectorSoftware/include/Detector.h
View File

@ -238,10 +238,10 @@ class Detector {
Result<int> getHighVoltage(Positions pos = {}) const; Result<int> getHighVoltage(Positions pos = {}) const;
/** [Jungfrau][Mythen3][Gotthard2] */ /** [Jungfrau][Mythen3][Gotthard2][Moench] */
Result<bool> getPowerChip(Positions pos = {}) const; Result<bool> getPowerChip(Positions pos = {}) const;
/** [Jungfrau][Mythen3][Gotthard2] */ /** [Jungfrau][Mythen3][Gotthard2][Moench] */
void setPowerChip(bool on, Positions pos = {}); void setPowerChip(bool on, Positions pos = {});
/** /**

2
slsDetectorSoftware/src/CmdProxy.h
View File

@ -1081,7 +1081,7 @@ class CmdProxy {
"\n\t[Jungfrau][Ctb][Moench] [0|60-200]"); "\n\t[Jungfrau][Ctb][Moench] [0|60-200]");
INTEGER_COMMAND(powerchip, getPowerChip, setPowerChip, std::stoi, 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." "\n\t[Jungfrau] Get will return power status."
"Can be off if temperature event occured (temperature over temp_threshold with temp_control enabled." "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" "\n\t[Mythen3] If module not connected or wrong module, 1 will fail. By default, not powered on"

2
slsSupportLib/include/versionAPI.h
View File

@ -8,5 +8,5 @@
#define APIRECEIVER 0x200227 #define APIRECEIVER 0x200227
#define APIGUI 0x200227 #define APIGUI 0x200227
#define APICTB 0x200227 #define APICTB 0x200227
#define APIMOENCH 0x200303
#define APIGOTTHARD2 0x200304 #define APIGOTTHARD2 0x200304
#define APIMOENCH 0x200304