diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 9958b8507..d2aa65507 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index 8e7005f2f..4b0ceb500 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -1962,7 +1962,7 @@ int setHighVoltage(int val, char *mess) { } int getHighVoltage(int *retval, char *mess) { - LOG(logDEBUG1, ("High Voltage: %d\n", retval)); + LOG(logDEBUG1, ("High Voltage: %d\n", *retval)); *retval = highvoltage; return OK; } diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer index a7220d3a2..4efd2108f 100755 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c index 0349546a5..145538bd2 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -1541,7 +1541,7 @@ int getDAC(enum DACINDEX ind, int mV, int *retval, char *mess) { return OK; } *retval = retvals[0]; - LOG(logINFO, ("\tvthreshold match %d\n"), retval); + LOG(logINFO, ("\tvthreshold match %d\n", *retval)); return OK; } diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index 5a579a744..ef9dd34a5 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c index c62e3f891..ae56a21c3 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c @@ -1575,7 +1575,7 @@ int setDAC(enum DACINDEX ind, int val, int mV, char *mess) { } } - if (LTC2620_D_SetDACValue((int)ind, val) == FAIL) { + if (LTC2620_D_SetDACValue((int)ind, dacval) == FAIL) { sprintf(mess, "Could not set DAC %s.\n", dacNames[ind]); LOG(logERROR, (mess)); return FAIL; @@ -1669,7 +1669,7 @@ int setHighVoltage(int val, char *mess) { int getHighVoltage(int *retval, char *mess) { int ret = DAC6571_Get(retval, mess); - LOG(logDEBUG1, ("High Voltage: %d\n", retval)); + LOG(logDEBUG1, ("High Voltage: %d\n", *retval)); return ret; } diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index cc4cf0b96..df0cb9f04 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 375c5d531..446c0e235 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -1482,7 +1482,7 @@ int setHighVoltage(int val, char *mess) { } int getHighVoltage(int *retval, char *mess) { - LOG(logDEBUG1, ("High Voltage: %d\n", retval)); + LOG(logDEBUG1, ("High Voltage: %d\n", *retval)); *retval = highvoltage; return OK; } diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index 99cf93c0d..b5e11283e 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c index 2e94fceae..e371f02de 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c @@ -1048,7 +1048,7 @@ int setHighVoltage(int val, char *mess) { } int getHighVoltage(int *retval, char *mess) { - LOG(logDEBUG1, ("High Voltage: %d\n", retval)); + LOG(logDEBUG1, ("High Voltage: %d\n", *retval)); *retval = highvoltage; return OK; } diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index 3391193cd..9ba013e82 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c index 04cbeef78..986701b85 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c @@ -1666,7 +1666,7 @@ int setGeneralDAC(enum DACINDEX ind, int val, int mV, char *mess) { } } - if (LTC2620_D_SetDACValue((int)ind, val) == FAIL) { + if (LTC2620_D_SetDACValue((int)ind, dacval) == FAIL) { sprintf(mess, "Could not set DAC %s.\n", dacNames[ind]); LOG(logERROR, (mess)); return FAIL; @@ -1727,7 +1727,7 @@ int getDAC(enum DACINDEX ind, int mV, int *retval, char *mess) { LOG(logERROR, (mess)); return FAIL; } - LOG(logINFO, ("\tvthreshold match %d\n", retval)); + LOG(logINFO, ("\tvthreshold match %d\n", *retval)); return OK; } @@ -1793,7 +1793,7 @@ int setHighVoltage(int val, char *mess) { int getHighVoltage(int *retval, char *mess) { int ret = DAC6571_Get(retval, mess); - LOG(logDEBUG1, ("High Voltage: %d\n", retval)); + LOG(logDEBUG1, ("High Voltage: %d\n", *retval)); return ret; }