mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-08-09 19:40:28 +02:00
Dev/eiger vthreshold undefined setting (#1515)
Build on RHEL9 docker image / build (push) Successful in 4m9s
Build on RHEL8 docker image / build (push) Successful in 5m7s
Build and Deploy on local RHEL9 / build (push) Successful in 2m2s
Build and Deploy on local RHEL8 / build (push) Successful in 5m1s
Run Simulator Tests on local RHEL9 / build (push) Successful in 20m9s
Run Simulator Tests on local RHEL8 / build (push) Successful in 23m30s
Build on RHEL9 docker image / build (push) Successful in 4m9s
Build on RHEL8 docker image / build (push) Successful in 5m7s
Build and Deploy on local RHEL9 / build (push) Successful in 2m2s
Build and Deploy on local RHEL8 / build (push) Successful in 5m1s
Run Simulator Tests on local RHEL9 / build (push) Successful in 20m9s
Run Simulator Tests on local RHEL8 / build (push) Successful in 23m30s
* eiger: setting vthreshold dac should also set settings to undefined (refactored to switch for readability) * compiled with version
This commit is contained in:
Binary file not shown.
@@ -1179,12 +1179,20 @@ int processDACEnums(enum dacIndex ind, int val, bool mV) {
|
||||
if (val != GET_FLAG) {
|
||||
ret = setDAC(serverDacIndex, val, mV, mess);
|
||||
// handle if set by user individually
|
||||
if (serverDacIndex == E_VCMP_LL || serverDacIndex == E_VCMP_LR ||
|
||||
serverDacIndex == E_VCMP_RL || serverDacIndex == E_VCMP_RR ||
|
||||
serverDacIndex == E_VRPREAMP || serverDacIndex == E_VCP) {
|
||||
switch (serverDacIndex) {
|
||||
case E_VCMP_LL:
|
||||
case E_VCMP_LR:
|
||||
case E_VCMP_RL:
|
||||
case E_VCMP_RR:
|
||||
case E_VTHRESHOLD:
|
||||
case E_VRPREAMP:
|
||||
case E_VCP:
|
||||
setSettings(UNDEFINED, mess);
|
||||
LOG(logERROR, ("Settings has been changed "
|
||||
"to undefined (changed specific dacs)\n"));
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
// get
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#define APICTB "0.0.0 0x260506"
|
||||
#define APIGOTTHARD2 "0.0.0 0x260427"
|
||||
#define APIMOENCH "0.0.0 0x260424"
|
||||
#define APIEIGER "0.0.0 0x260424"
|
||||
#define APIEIGER "0.0.0 0x260807"
|
||||
#define APIXILINXCTB "0.0.0 0x260506"
|
||||
#define APIJUNGFRAU "0.0.0 0x260424"
|
||||
#define APIMYTHEN3 "0.0.0 0x260506"
|
||||
|
||||
Reference in New Issue
Block a user