diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index 79db32373..ed46cd1b8 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 4a16cc2fb..8e684625f 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c @@ -451,10 +451,15 @@ int readConfigFile() { return initError; } + // require a sleep before and after the rst dac signal + usleep (1 * 1000); + // inform FPGA that onchip dacs will be configured soon FILE_LOG(logINFO, ("Setting configuration starting bit\n")); bus_w(ASIC_CONFIG_REG, bus_r(ASIC_CONFIG_REG) | ASIC_CONFIG_RST_DAC_MSK); + usleep (1 * 1000); + FILE* fd = fopen(CONFIG_FILE, "r"); if(fd == NULL) { sprintf(initErrorMessage, "Could not open on-board detector server config file [%s].\n", CONFIG_FILE); diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h index 2762f353a..46291b399 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h @@ -32,8 +32,8 @@ #define DEFAULT_BURST_MODE (BURST_INTERNAL) #define DEFAULT_NUM_FRAMES (1) #define DEFAULT_NUM_CYCLES (1) -#define DEFAULT_EXPTIME (1 * 1000 * 1000) // 1 ms -#define DEFAULT_PERIOD (1 * 1000 * 1000 * 1000) // 1 s +#define DEFAULT_EXPTIME (0) // 0 ms (220ns in firmware) +#define DEFAULT_PERIOD (1 * 1000) // 1 ms #define DEFAULT_DELAY_AFTER_TRIGGER (0) #define DEFAULT_HIGH_VOLTAGE (0) #define DEFAULT_TIMING_MODE (AUTO_TIMING) diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 4deb8a5e7..3713b1a1b 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -8,5 +8,5 @@ #define APICTB 0x200131 #define APIJUNGFRAU 0x200131 #define APIMOENCH 0x200131 -#define APIGOTTHARD2 0x200131 #define APIMYTHEN3 0x200130 +#define APIGOTTHARD2 0x200204