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

Merge branch 'developer' into gui

Browse Source
This commit is contained in:
maliakal_d 2019-06-04 18:12:41 +02:00
commit ff3e5001e6
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/slsDetectorServer/LTC2620.h
View File

@ -302,9 +302,7 @@ int LTC2620_SetDACValue (int dacnum, int val, int mV, int* dacval) {
// set // set
if ( (*dacval >= 0) || (*dacval == LTC2620_PWR_DOWN_VAL)) { if ( (*dacval >= 0) || (*dacval == LTC2620_PWR_DOWN_VAL)) {
#ifndef CHIPTESTBOARDD
FILE_LOG(logINFO, ("Setting DAC %d: %d dac (%d mV)\n",dacnum, *dacval, dacmV)); FILE_LOG(logINFO, ("Setting DAC %d: %d dac (%d mV)\n",dacnum, *dacval, dacmV));
#endif
LTC2620_SetDAC(dacnum, *dacval); LTC2620_SetDAC(dacnum, *dacval);
} }
return OK; return OK;

23
slsDetectorSoftware/src/slsDetectorCommand.cpp
View File

@ -3878,13 +3878,16 @@ std::string slsDetectorCommand::cmdDAC(int narg, const char * const args[], int
int val = -1; int val = -1;
char answer[1000]; char answer[1000];
int mode = 0; int mode = 0;
int iarg = 1;
if (cmd == "dac") { if (cmd == "dac") {
int idac = -1; int idac = -1;
if (sscanf(args[1], "%d", &idac) != 1) { if (sscanf(args[iarg], "%d", &idac) != 1) {
return std::string("Could not scan dac index") + std::string(args[1]); return std::string("Could not scan dac index") + std::string(args[iarg]);
} }
dac = (dacIndex)idac; dac = (dacIndex)idac;
++iarg;
--narg;
} }
else if (cmd == "adcvpp") else if (cmd == "adcvpp")
dac = ADC_VPP; dac = ADC_VPP;
@ -4017,22 +4020,22 @@ std::string slsDetectorCommand::cmdDAC(int narg, const char * const args[], int
if (action == PUT_ACTION) { if (action == PUT_ACTION) {
if (narg >= 3) if (sscanf(args[iarg], "%d", &val))
if (!strcasecmp(args[2], "mv"))
mode = 1;
if (sscanf(args[1], "%d", &val))
; ;
else else
return std::string("cannot scan DAC value ") + std::string(args[1]); return std::string("cannot scan DAC value ") + std::string(args[iarg]);
++iarg;
if ((narg >= 3) && (!strcasecmp(args[iarg], "mv")))
mode = 1;
myDet->setDAC(val, dac, mode, detPos); myDet->setDAC(val, dac, mode, detPos);
} }
// get (dacs in dac units or mV) // get (dacs in dac units or mV)
else if ((narg >= 2) && (!strcasecmp(args[1], "mv"))) { else if ((narg >= 2) && (!strcasecmp(args[iarg], "mv"))) {
mode = 1; mode = 1;
} }
sprintf(answer, "%d", myDet->setDAC(-1, dac, mode, detPos)); sprintf(answer, "%d", myDet->setDAC(-1, dac, mode, detPos));
if (mode) if (mode)
strcat(answer, " mV"); strcat(answer, " mV");

2
slsSupportLib/include/versionAPI.h
View File

@ -5,6 +5,6 @@
#define APIRECEIVER 0x190405 #define APIRECEIVER 0x190405
#define APIGUI 0x190405 #define APIGUI 0x190405
#define APIGOTTHARD 0x190604 #define APIGOTTHARD 0x190604
#define APICTB 0x190604
#define APIJUNGFRAU 0x190604 #define APIJUNGFRAU 0x190604
#define APIEIGER 0x190604 #define APIEIGER 0x190604
#define APICTB 0x190604