diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 2bcda6f53..2692e11e1 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 1685b94fa..9cee22119 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -1450,12 +1450,6 @@ int validateVchip(int val, char *mess) { LOG(logERROR, (mess)); return FAIL; } - if (vLimit > 0 && val > vLimit) { - sprintf(mess, "Invalid vchip value %d mV. Exceeds vLimit %d mV\n", val, - vLimit); - LOG(logERROR, (mess)); - return FAIL; - } return OK; } diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp index 04734111d..b9f63a4bd 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp @@ -1108,6 +1108,14 @@ TEST_CASE("v_abcd", "[.detectorintegration]") { caller.call(cmds[i], {}, -1, GET, oss2); REQUIRE(oss2.str() == cmds[i] + " 1200\n"); } + { + auto vlimit = det.getDAC(defs::V_LIMIT)[0]; + det.setDAC(defs::V_LIMIT, 1500, true, {0}); + REQUIRE_NOTHROW(caller.call(cmds[i], {"1200"}, -1, PUT)); + if (vlimit < 0) + vlimit = 0; + det.setDAC(defs::V_LIMIT, vlimit, true, {0}); + } for (int imod = 0; imod != det.size(); ++imod) { if (det_type == defs::XILINX_CHIPTESTBOARD && prev_val[imod] == -100) {