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

ctb server: vlimit not impl, adc in degrees

Browse Source
This commit is contained in:
maliakal_d 2019-02-14 18:28:32 +01:00
parent 501c579f6b
commit 4a8a72c447
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorServers/ctbDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: bb37915419c92539129343611cfd9bf3cdfc0bda Repsitory UUID: 501c579f6b5d63ceee66cd10285890bf65e44e8e
Revision: 12 Revision: 17
Branch: refactor Branch: refactor
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4297 Last Changed Rev: 4331
Last Changed Date: 2019-02-06 08:43:16.000000002 +0100 ./RegisterDefs.h Last Changed Date: 2019-02-14 09:37:20.000000002 +0100 ./RegisterDefs.h

6
slsDetectorServers/ctbDetectorServer/gitInfoCtb.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "bb37915419c92539129343611cfd9bf3cdfc0bda" #define GITREPUUID "501c579f6b5d63ceee66cd10285890bf65e44e8e"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4297 #define GITREV 0x4331
#define GITDATE 0x20190206 #define GITDATE 0x20190214
#define GITBRANCH "refactor" #define GITBRANCH "refactor"

7
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -691,6 +691,13 @@ int set_dac(int file_des) {
case V_POWER_CHIP: case V_POWER_CHIP:
serverDacIndex = D_PWR_CHIP; serverDacIndex = D_PWR_CHIP;
break; break;
case V_LIMIT:
break;
#elif MOENCHD
case ADC_VPP:
case HIGH_VOLTAGE:
case V_LIMIT:
break;
#endif #endif
default: default:
#ifdef JUNGFRAUD #ifdef JUNGFRAUD

2
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -4063,7 +4063,7 @@ std::string slsDetectorCommand::cmdADC(int narg, char *args[], int action, int d
else sprintf(answer,"%d",myDet->getADC(adc, detPos)); else sprintf(answer,"%d",myDet->getADC(adc, detPos));
//if ((adc == TEMPERATURE_ADC) || (adc == TEMPERATURE_FPGA)) //if ((adc == TEMPERATURE_ADC) || (adc == TEMPERATURE_FPGA))
if (adc<=100 || adc == SLOW_ADC_TEMP) if (adc < 100 || adc == SLOW_ADC_TEMP)
strcat(answer,"°C"); strcat(answer,"°C");
else else
strcat(answer,"mV"); strcat(answer,"mV");