mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-05-14 05:25:36 +02:00
merge fix
This commit is contained in:
Binary file not shown.
@@ -595,10 +595,9 @@ void setupDetector() {
|
||||
LTC2620_Configure();
|
||||
|
||||
// dacs only
|
||||
LOG(logINFOBLUE, ("Powering down all dacs\n"));
|
||||
LOG(logINFOBLUE, ("Setting all dacs to min (0 mV)\n"));
|
||||
for (int idac = 0; idac < NDAC_ONLY; ++idac) {
|
||||
initError =
|
||||
setDAC(idac, LTC2620_GetPowerDownValue(), false, initErrorMessage);
|
||||
initError = setDAC(idac, 0, false, initErrorMessage);
|
||||
if (initError == FAIL)
|
||||
return;
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -410,10 +410,9 @@ void setupDetector() {
|
||||
return;
|
||||
}
|
||||
// dacs only
|
||||
LOG(logINFOBLUE, ("Powering down all dacs\n"));
|
||||
LOG(logINFOBLUE, ("Setting all dacs to min (0 mV)\n"));
|
||||
for (int idac = 0; idac < NDAC_ONLY; ++idac) {
|
||||
initError = setDAC(idac, LTC2620_D_GetPowerDownValue(), false,
|
||||
initErrorMessage);
|
||||
initError = setDAC(idac, 0, false, initErrorMessage);
|
||||
if (initError == FAIL)
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -3,10 +3,10 @@
|
||||
/** API versions */
|
||||
#define APILIB "0.0.0 0x250909"
|
||||
#define APIRECEIVER "0.0.0 0x250822"
|
||||
#define APICTB "0.0.0 0x260227"
|
||||
#define APICTB "0.0.0 0x260317"
|
||||
#define APIGOTTHARD2 "0.0.0 0x260227"
|
||||
#define APIMOENCH "0.0.0 0x260227"
|
||||
#define APIEIGER "0.0.0 0x260227"
|
||||
#define APIXILINXCTB "0.0.0 0x260305"
|
||||
#define APIXILINXCTB "0.0.0 0x260324"
|
||||
#define APIJUNGFRAU "0.0.0 0x260227"
|
||||
#define APIMYTHEN3 "0.0.0 0x260227"
|
||||
|
||||
Reference in New Issue
Block a user