diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index ded41f7e6..cb2916a1a 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 3fdecebdf..8e7005f2f 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -1431,25 +1431,28 @@ int setVLimit(int val, char *mess) { } int getVchip(int *retval, char *mess) { - *retval = -1; + *retval = dacValues[D_PWR_CHIP]; + // not set yet - if (dacValues[D_PWR_CHIP] == -1) { + if (*retval == -1) { LOG(logWARNING, ("Retrieving Vchip that has not been set yet.\n")); - return dacValues[D_PWR_CHIP]; + return OK; } - if (dacValues[D_PWR_CHIP] == LTC2620_GetPowerDownValue()) { - return dacValues[D_PWR_CHIP]; + if (*retval == LTC2620_GetPowerDownValue()) { + LOG(logWARNING, ("Vchip dac at power down value\n")); + return OK; } // dac to voltage + int dacval = dacValues[D_PWR_CHIP]; if (ConvertToDifferentRange(LTC2620_GetMaxInput(), LTC2620_GetMinInput(), - VCHIP_MIN_MV, VCHIP_MAX_MV, - dacValues[D_PWR_CHIP], retval) == FAIL) { + VCHIP_MIN_MV, VCHIP_MAX_MV, dacval, + retval) == FAIL) { sprintf(mess, "Could not convert to voltage. Input value for vchip " "outside bounds.\n"); LOG(logERROR, (mess)); return FAIL; } - LOG(logDEBUG1, ("Vchip: %d\n", retval)); + LOG(logDEBUG1, ("Vchip: %d\n", *retval)); return OK; } diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 61f1b46a4..37da95cb8 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index 25be35206..dd15074df 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ