diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index 8a98b5fd2..e4f5ed96f 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 6e87c56ec..bcb3a8f87 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c @@ -987,6 +987,8 @@ int readConfigFile() { // to inform powerchip config parameters are set startupPowerChipConfigDone = 1; + chipConfigured = 1; + LOG(logINFOBLUE, ("Chip configured\n")); } return initError; } @@ -2278,8 +2280,7 @@ int powerChip(int on, char *mess) { if (on) { LOG(logINFO, ("Powering chip: on\n")); bus_w(CONTROL_REG, bus_r(CONTROL_REG) | CONTROL_PWR_CHIP_MSK); - // only if power chip config done, configure chip with current set up - if (startupPowerChipConfigDone == 1 && configureChip(mess) == FAIL) + if (configureChip(mess) == FAIL) return FAIL; } else { // throw if high voltage on @@ -2310,6 +2311,12 @@ int getPowerChip() { int isChipConfigured() { return chipConfigured; } int configureChip(char *mess) { + + if (!startupPowerChipConfigDone) { + LOG(logINFOBLUE, + ("Startup: Chip to be configured when reading config file\n")); + return OK; + } LOG(logINFOBLUE, ("\tConfiguring chip\n")); // on chip dacs diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 3e79c970f..00b5edda5 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -9,6 +9,6 @@ #define APIEIGER "developer 0x240918" #define APIMYTHEN3 "developer 0x241001" #define APIJUNGFRAU "developer 0x241001" -#define APIGOTTHARD2 "developer 0x241007" #define APIRECEIVER "developer 0x241014" #define APILIB "developer 0x241021" +#define APIGOTTHARD2 "developer 0x241022"