diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv10.1.0 b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv10.1.0 index 2cb626024..91cf1f5e5 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv10.1.0 and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv10.1.0 differ diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c index 5206fa0d7..3aadf9dea 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c @@ -2298,6 +2298,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); + usleep(50 * 1000); // wait for chip to be ready if (configureChip(mess) == FAIL) return FAIL; } else { diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv10.0.0 b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv10.0.0 deleted file mode 100755 index 75cd38362..000000000 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv10.0.0 and /dev/null differ diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv10.1.0 b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv10.1.0 index 8b5209ee8..7fec4b336 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv10.1.0 and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv10.1.0 differ diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c index bfd69a73b..82b6ed4cd 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c @@ -2204,6 +2204,7 @@ int powerChip(int on) { if (on) { LOG(logINFO, ("Powering chip: on\n")); bus_w(CONTROL_REG, bus_r(CONTROL_REG) | CONTROL_PWR_CHIP_MSK); + usleep(50 * 1000); // wait for chip to be ready } else { LOG(logINFO, ("Powering chip: off\n")); bus_w(CONTROL_REG, bus_r(CONTROL_REG) & ~CONTROL_PWR_CHIP_MSK); diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 6bc666f15..021c8a515 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -4,9 +4,9 @@ #define APILIB "10.1.0 0x260806" #define APIRECEIVER "10.1.0 0x260806" #define APICTB "10.1.0 0x261109" -#define APIGOTTHARD2 "10.1.0 0x261106" +#define APIGOTTHARD2 "10.1.0 0x261112" #define APIMOENCH "10.1.0 0x261109" #define APIEIGER "10.1.0 0x261105" #define APIXILINXCTB "10.1.0 0x261106" #define APIJUNGFRAU "10.1.0 0x261109" -#define APIMYTHEN3 "10.1.0 0x261106" +#define APIMYTHEN3 "10.1.0 0x261112"