diff --git a/slsDetectorSoftware/generator/commands.yaml b/slsDetectorSoftware/generator/commands.yaml index 815857dc0..3c93571d8 100644 --- a/slsDetectorSoftware/generator/commands.yaml +++ b/slsDetectorSoftware/generator/commands.yaml @@ -691,7 +691,7 @@ highvoltage: function: setHighVoltage powerchip: - help: "[0, 1]\n\t[Jungfrau][Moench][Mythen3][Gotthard2][Xilinx Ctb] Power the chip. \n\t[Jungfrau][Moench] Default is 0. Get will return power status. Can be off if temperature event occured (temperature over temp_threshold with temp_control enabled. Will configure chip (only chip v1.1)\n\t[Mythen3][Gotthard2] Default is 1. If module not connected or wrong module, powerchip will fail.\n\t[Xilinx Ctb] Default is 0. Also configures the chip if powered on." + help: "[0, 1]\n\t[Jungfrau][Moench][Mythen3][Gotthard2] Power the chip. \n\t[Jungfrau][Moench] Default is 0. Get will return power status. Can be off if temperature event occured (temperature over temp_threshold with temp_control enabled. Will configure chip (only chip v1.1)\n\t[Mythen3][Gotthard2] Default is 1. If module not connected or wrong module, powerchip will fail." inherit_actions: INTEGER_COMMAND_VEC_ID actions: GET: diff --git a/slsDetectorSoftware/generator/extended_commands.yaml b/slsDetectorSoftware/generator/extended_commands.yaml index 527861421..2473981cf 100644 --- a/slsDetectorSoftware/generator/extended_commands.yaml +++ b/slsDetectorSoftware/generator/extended_commands.yaml @@ -7322,12 +7322,11 @@ powerchip: store_result_in_t: false command_name: powerchip function_alias: powerchip - help: "[0, 1]\n\t[Jungfrau][Moench][Mythen3][Gotthard2][Xilinx Ctb] Power the chip.\ - \ \n\t[Jungfrau][Moench] Default is 0. Get will return power status. Can be off\ - \ if temperature event occured (temperature over temp_threshold with temp_control\ - \ enabled. Will configure chip (only chip v1.1)\n\t[Mythen3][Gotthard2] Default\ - \ is 1. If module not connected or wrong module, powerchip will fail.\n\t[Xilinx\ - \ Ctb] Default is 0. Also configures the chip if powered on." + help: "[0, 1]\n\t[Jungfrau][Moench][Mythen3][Gotthard2] Power the chip. \n\t[Jungfrau][Moench]\ + \ Default is 0. Get will return power status. Can be off if temperature event\ + \ occured (temperature over temp_threshold with temp_control enabled. Will configure\ + \ chip (only chip v1.1)\n\t[Mythen3][Gotthard2] Default is 1. If module not connected\ + \ or wrong module, powerchip will fail." infer_action: true template: true powerdac: diff --git a/slsDetectorSoftware/include/sls/Detector.h b/slsDetectorSoftware/include/sls/Detector.h index e6a6d71fa..910437e19 100644 --- a/slsDetectorSoftware/include/sls/Detector.h +++ b/slsDetectorSoftware/include/sls/Detector.h @@ -474,10 +474,10 @@ class Detector { */ void setHighVoltage(int value, Positions pos = {}); - /** [Jungfrau][Moench][Mythen3][Gotthard2][Xilinx Ctb] */ + /** [Jungfrau][Moench][Mythen3][Gotthard2] */ Result getPowerChip(Positions pos = {}) const; - /** [Jungfrau][Moench][Mythen3][Gotthard2][Xilinx Ctb] Power the chip. \n + /** [Jungfrau][Moench][Mythen3][Gotthard2] Power the chip. \n * Default is disabled. \n * [Jungfrau][Moench] Default is disabled. Get will return power status. Can * be off if temperature event occured (temperature over temp_threshold with diff --git a/slsDetectorSoftware/src/Caller.cpp b/slsDetectorSoftware/src/Caller.cpp index cd3991d83..46a69a3a6 100644 --- a/slsDetectorSoftware/src/Caller.cpp +++ b/slsDetectorSoftware/src/Caller.cpp @@ -8874,10 +8874,9 @@ std::string Caller::powerchip(int action) { // print help if (action == slsDetectorDefs::HELP_ACTION) { os << R"V0G0N([0, 1] - [Jungfrau][Moench][Mythen3][Gotthard2][Xilinx Ctb] Power the chip. + [Jungfrau][Moench][Mythen3][Gotthard2] Power the chip. [Jungfrau][Moench] Default is 0. Get will return power status. Can be off if temperature event occured (temperature over temp_threshold with temp_control enabled. Will configure chip (only chip v1.1) - [Mythen3][Gotthard2] Default is 1. If module not connected or wrong module, powerchip will fail. - [Xilinx Ctb] Default is 0. Also configures the chip if powered on. )V0G0N" + [Mythen3][Gotthard2] Default is 1. If module not connected or wrong module, powerchip will fail. )V0G0N" << std::endl; return os.str(); }