From b109ea8d7d1553e839e04e92c1d62a8b33abbc00 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 8 Oct 2019 18:00:22 +0200 Subject: [PATCH] jungfrau vref_prech, dac enum similar to mainenum --- .../bin/jungfrauDetectorServer_developer | Bin 139860 -> 139860 bytes .../slsDetectorFunctionList.c | 2 +- .../slsDetectorServer_defs.h | 2 +- slsSupportLib/include/versionAPI.h | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 163d99c82a2a9b6f298bf6c14ec4698a1b9f4701..066463ef43fbb46b15d07c85994310f51e1e9d4b 100755 GIT binary patch delta 41 wcmca|gyYH)jtQE~b2fQQU$~o5Vx!9s4kiwP&32r9MnJmxob~o|){Je>0A%72I{*Lx delta 41 xcmca|gyYH)jtQE~6Muf0zHm3A#737N983nBo9#IJjDU3WIqU7`tQp&$0RV(A5oG`X diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c index 5cbe9d120..59b725cea 100755 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -909,7 +909,7 @@ void setDAC(enum DACINDEX ind, int val, int mV) { #else if (LTC2620_SetDACValue((int)ind, val, mV, &dacval) == OK) { dacValues[ind] = dacval; - if (ind == VREF_COMP && (val >= 0)) {//FIXME: if val == pwr down value, write 0? + if (ind == J_VREF_COMP && (val >= 0)) {//FIXME: if val == pwr down value, write 0? bus_w (VREF_COMP_MOD_REG, (bus_r(VREF_COMP_MOD_REG) &~ (VREF_COMP_MOD_MSK)) // reset | ((val << VREF_COMP_MOD_OFST) & VREF_COMP_MOD_MSK)); // or it with value } diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h index 086de0775..61a8d9ca8 100755 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h @@ -38,7 +38,7 @@ typedef struct udp_header_struct { /* Enums */ enum ADCINDEX {TEMP_FPGA, TEMP_ADC}; -enum DACINDEX {VB_COMP, VDD_PROT, VIN_COM, VREF_PRECH, VB_PIXBUF, VB_DS, VREF_DS, VREF_COMP }; +enum DACINDEX {J_VB_COMP, J_VDD_PROT, J_VIN_COM, J_VREF_PRECH, J_VB_PIXBUF, J_VB_DS, J_VREF_DS, J_VREF_COMP }; #define DEFAULT_DAC_VALS { 1220, /* VB_COMP */ \ 3000, /* VDD_PROT */ \ 1053, /* VIN_COM */ \ diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 607be3246..a1ece1458 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -6,7 +6,7 @@ #define APIMOENCH 0x190820 #define APICTB 0x190930 #define APIGOTTHARD 0x190930 -#define APIJUNGFRAU 0x190930 #define APIEIGER 0x190930 #define APIMYTHEN3 0x191008 #define APIGOTTHARD2 0x191008 +#define APIJUNGFRAU 0x191008