From 4a8a72c447b1b56013af9f82c014d1887d032ffd Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 14 Feb 2019 18:28:32 +0100 Subject: [PATCH] ctb server: vlimit not impl, adc in degrees --- slsDetectorServers/ctbDetectorServer/gitInfo.txt | 8 ++++---- slsDetectorServers/ctbDetectorServer/gitInfoCtb.h | 6 +++--- .../slsDetectorServer/slsDetectorServer_funcs.c | 7 +++++++ slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/slsDetectorServers/ctbDetectorServer/gitInfo.txt b/slsDetectorServers/ctbDetectorServer/gitInfo.txt index a7e95c933..306ef576b 100644 --- a/slsDetectorServers/ctbDetectorServer/gitInfo.txt +++ b/slsDetectorServers/ctbDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: bb37915419c92539129343611cfd9bf3cdfc0bda -Revision: 12 +Repsitory UUID: 501c579f6b5d63ceee66cd10285890bf65e44e8e +Revision: 17 Branch: refactor Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4297 -Last Changed Date: 2019-02-06 08:43:16.000000002 +0100 ./RegisterDefs.h +Last Changed Rev: 4331 +Last Changed Date: 2019-02-14 09:37:20.000000002 +0100 ./RegisterDefs.h diff --git a/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h b/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h index 75d659b46..fe6365147 100644 --- a/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h +++ b/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "bb37915419c92539129343611cfd9bf3cdfc0bda" +#define GITREPUUID "501c579f6b5d63ceee66cd10285890bf65e44e8e" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4297 -#define GITDATE 0x20190206 +#define GITREV 0x4331 +#define GITDATE 0x20190214 #define GITBRANCH "refactor" diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c index 39e03d718..a5ab7719f 100755 --- a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c @@ -691,6 +691,13 @@ int set_dac(int file_des) { case V_POWER_CHIP: serverDacIndex = D_PWR_CHIP; break; + case V_LIMIT: + break; +#elif MOENCHD + case ADC_VPP: + case HIGH_VOLTAGE: + case V_LIMIT: + break; #endif default: #ifdef JUNGFRAUD diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index 7b5642071..694b32008 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -4063,7 +4063,7 @@ std::string slsDetectorCommand::cmdADC(int narg, char *args[], int action, int d else sprintf(answer,"%d",myDet->getADC(adc, detPos)); //if ((adc == TEMPERATURE_ADC) || (adc == TEMPERATURE_FPGA)) - if (adc<=100 || adc == SLOW_ADC_TEMP) + if (adc < 100 || adc == SLOW_ADC_TEMP) strcat(answer,"°C"); else strcat(answer,"mV");