From e6bd874a88493557fc5127d4a1686832299aaf06 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 5 Feb 2018 11:50:22 +0100 Subject: [PATCH] modified jungfrau server and client to make auto_comp_disable a not yet implemented feature as it requires a firmware upgrade --- ...3.0.1.1 => jungfrauDetectorServerv3.0.1.2} | Bin 110424 -> 110232 bytes .../slsDetector/slsDetectorCommand.cpp | 6 +++--- .../slsDetectorServer_funcs.c | 10 ++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) rename slsDetectorSoftware/jungfrauDetectorServer/bin/{jungfrauDetectorServerv3.0.1.1 => jungfrauDetectorServerv3.0.1.2} (51%) diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.1.1 b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.1.2 similarity index 51% rename from slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.1.1 rename to slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.1.2 index 2040d86b79505964c4b22f412d06743dacbf2912..2ceabc6dec4062bc0752c7fc4418ed0b0adbc5bf 100755 GIT binary patch delta 28855 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 XR1Q)2*7ML!qqHpyLgBU?sQiBbsRQTL delta 28948 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 diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index 32fee72ff..db8a8505e 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -461,7 +461,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { ++i; /*! \page config - - auto_comp_disable i this mode disables the on-chip gain switching comparator automatically after 93.75% of exposure time (only for longer than 100us). 1 enables mode, 0 disables mode. By default, mode is disabled (comparator is enabled throughout). (JUNGFRAU only). \c Returns \c (int) + - auto_comp_disable i Currently not implemented. this mode disables the on-chip gain switching comparator automatically after 93.75% of exposure time (only for longer than 100us). 1 enables mode, 0 disables mode. By default, mode is disabled (comparator is enabled throughout). (JUNGFRAU only). \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="auto_comp_disable"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAdvanced; @@ -5908,7 +5908,7 @@ string slsDetectorCommand::helpAdvanced(int narg, char *args[], int action) { os << "led s \t sets led status (0 off, 1 on)" << std::endl; os << "powerchip i \t powers on or off the chip. i = 1 for on, i = 0 for off" << std::endl; - os << "auto_comp_disable i \t this mode disables the on-chip gain switching comparator automatically after 93.75% of exposure time (only for longer than 100us). 1 enables mode, 0 disables mode. By default, mode is disabled (comparator is enabled throughout). (JUNGFRAU only). " << std::endl; + os << "auto_comp_disable i \t Currently not implemented. this mode disables the on-chip gain switching comparator automatically after 93.75% of exposure time (only for longer than 100us). 1 enables mode, 0 disables mode. By default, mode is disabled (comparator is enabled throughout). (JUNGFRAU only). " << std::endl; } if (action==GET_ACTION || action==HELP_ACTION) { @@ -5918,7 +5918,7 @@ string slsDetectorCommand::helpAdvanced(int narg, char *args[], int action) { os << "led \t returns led status (0 off, 1 on)" << std::endl; os << "flags \t gets the readout flags. can be none, storeinram, tot, continous, parallel, nonparallel, safe, unknown" << std::endl; os << "powerchip \t gets if the chip has been powered on or off" << std::endl; - os << "auto_comp_disable \t gets if the automatic comparator diable mode is enabled/disabled" << std::endl; + os << "auto_comp_disable \t Currently not implemented. gets if the automatic comparator diable mode is enabled/disabled" << std::endl; } return os.str(); diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index c254f72e6..51df2032c 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -5107,6 +5107,15 @@ int auto_comp_disable(int file_des) { cprintf(RED, "%s", mess); #else + //to receive any arguments + while (n > 0) + n = receiveData(file_des,mess,MAX_STR_LENGTH,OTHER); + ret = FAIL; + sprintf(mess,"Function (Auto Comp Disable) is not yet implemented for this detector\n"); + cprintf(RED, "%s", mess); + + /* will be connected after teh fpga upgrade + // receive arguments int arg=-1; n = receiveData(file_des,&arg,sizeof(arg),INT32); @@ -5139,6 +5148,7 @@ int auto_comp_disable(int file_des) { #endif if (ret==OK && differentClients) ret=FORCE_UPDATE; + */ #endif // ret could be swapped during sendData