diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer index 27b78b752..57bd713ad 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer differ diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c index 60df02ce0..1c25cd20e 100644 --- a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c @@ -1035,8 +1035,10 @@ void setDAC(enum DACINDEX ind, int val, int mV) { if (val < 0) return; - LOG(logDEBUG1, ("Setting dac[%d]: %d %s \n", (int)ind, val, - (mV ? "mV" : "dac units"))); + char *dac_names[] = {DAC_NAMES}; + 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; #ifdef VIRTUAL if (!mV) { diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h index 399194b48..65f1030ca 100644 --- a/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h @@ -17,6 +17,10 @@ enum DACINDEX { enum CLKINDEX { ADC_CLK, NUM_CLOCKS }; #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 \ { \ 660, /* G_VREF_DS */ \ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 74c240203..105904a71 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c index f101cf97e..4e2a50410 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -843,8 +843,10 @@ void setDAC(enum DACINDEX ind, int val, int mV) { if (val < 0) return; - LOG(logDEBUG1, ("Setting dac[%d]: %d %s \n", (int)ind, val, - (mV ? "mV" : "dac units"))); + char *dac_names[] = {DAC_NAMES}; + 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; #ifdef VIRTUAL if (!mV) { diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h index 6763f8867..7094040b1 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h @@ -47,6 +47,10 @@ enum DACINDEX { J_VREF_DS, 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 \ { \ 1220, /* J_VB_COMP */ \ diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 09936fb19..58eb2130a 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -5,9 +5,9 @@ #define APIGUI 0x200804 #define APICTB 0x200910 -#define APIGOTTHARD 0x200910 -#define APIJUNGFRAU 0x200910 #define APIMOENCH 0x200910 #define APIEIGER 0x200910 #define APIGOTTHARD2 0x200910 #define APIMYTHEN3 0x200910 +#define APIGOTTHARD 0x200917 +#define APIJUNGFRAU 0x200917