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

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
Erik Frojdh 2020-09-17 17:13:30 +02:00
commit e01e41926c
7 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
View File

Binary file not shown.

6
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@ -1035,8 +1035,10 @@ void setDAC(enum DACINDEX ind, int val, int mV) {
if (val < 0) if (val < 0)
return; return;
LOG(logDEBUG1, ("Setting dac[%d]: %d %s \n", (int)ind, val, char *dac_names[] = {DAC_NAMES};
(mV ? "mV" : "dac units"))); LOG(logINFO, ("Setting DAC %s\n", dac_names[ind]));
LOG(logDEBUG1, ("Setting dac[%d - %s]: %d %s \n", (int)ind, dac_names[ind],
val, (mV ? "mV" : "dac units")));
int dacval = val; int dacval = val;
#ifdef VIRTUAL #ifdef VIRTUAL
if (!mV) { if (!mV) {

4
slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h
View File

@ -17,6 +17,10 @@ enum DACINDEX {
enum CLKINDEX { ADC_CLK, NUM_CLOCKS }; enum CLKINDEX { ADC_CLK, NUM_CLOCKS };
#define CLK_NAMES "adc" #define CLK_NAMES "adc"
#define DAC_NAMES \
"vref_ds", "vcascn_pb", "vcascp_pb", "vout_cm", "vcasc_out", "vin_cm", \
"vref_comp", "ib_testc"
#define DEFAULT_DAC_VALS \ #define DEFAULT_DAC_VALS \
{ \ { \
660, /* G_VREF_DS */ \ 660, /* G_VREF_DS */ \

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

6
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -843,8 +843,10 @@ void setDAC(enum DACINDEX ind, int val, int mV) {
if (val < 0) if (val < 0)
return; return;
LOG(logDEBUG1, ("Setting dac[%d]: %d %s \n", (int)ind, val, char *dac_names[] = {DAC_NAMES};
(mV ? "mV" : "dac units"))); LOG(logINFO, ("Setting DAC %s\n", dac_names[ind]));
LOG(logDEBUG1, ("Setting dac[%d - %s]: %d %s \n", (int)ind, dac_names[ind],
val, (mV ? "mV" : "dac units")));
int dacval = val; int dacval = val;
#ifdef VIRTUAL #ifdef VIRTUAL
if (!mV) { if (!mV) {

4
slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
View File

@ -47,6 +47,10 @@ enum DACINDEX {
J_VREF_DS, J_VREF_DS,
J_VREF_COMP J_VREF_COMP
}; };
#define DAC_NAMES \
"vb_comp", "vdd_prot", "vin_com", "vref_prech", "vb_pixbuf", "vb_ds", \
"vref_ds", "vref_comp"
#define DEFAULT_DAC_VALS \ #define DEFAULT_DAC_VALS \
{ \ { \
1220, /* J_VB_COMP */ \ 1220, /* J_VB_COMP */ \

4
slsSupportLib/include/versionAPI.h
View File

@ -5,9 +5,9 @@
#define APIGUI 0x200804 #define APIGUI 0x200804
#define APICTB 0x200910 #define APICTB 0x200910
#define APIGOTTHARD 0x200910
#define APIJUNGFRAU 0x200910
#define APIMOENCH 0x200910 #define APIMOENCH 0x200910
#define APIEIGER 0x200910 #define APIEIGER 0x200910
#define APIGOTTHARD2 0x200910 #define APIGOTTHARD2 0x200910
#define APIMYTHEN3 0x200910 #define APIMYTHEN3 0x200910
#define APIGOTTHARD 0x200917
#define APIJUNGFRAU 0x200917