detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 12:57:13 +02:00
Code Issues Actions Packages Releases Activity

gotthard2: longer wait for startup, period 0

Browse Source
This commit is contained in:
maliakal_d
2020-02-04 12:00:07 +01:00
parent 64214f22f9
commit 806a2736c1
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

4
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -452,13 +452,13 @@ int readConfigFile() {
} }
// require a sleep before and after the rst dac signal // require a sleep before and after the rst dac signal
usleep (1 * 1000); usleep (INITIAL_STARTUP_WAIT);
// inform FPGA that onchip dacs will be configured soon // inform FPGA that onchip dacs will be configured soon
FILE_LOG(logINFO, ("Setting configuration starting bit\n")); FILE_LOG(logINFO, ("Setting configuration starting bit\n"));
bus_w(ASIC_CONFIG_REG, bus_r(ASIC_CONFIG_REG) | ASIC_CONFIG_RST_DAC_MSK); bus_w(ASIC_CONFIG_REG, bus_r(ASIC_CONFIG_REG) | ASIC_CONFIG_RST_DAC_MSK);
usleep (1 * 1000); usleep (INITIAL_STARTUP_WAIT);
FILE* fd = fopen(CONFIG_FILE, "r"); FILE* fd = fopen(CONFIG_FILE, "r");
if(fd == NULL) { if(fd == NULL) {

3
slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
View File

@ -27,13 +27,14 @@
#define TYPE_GOTTHARD2_MODULE_VAL (512) #define TYPE_GOTTHARD2_MODULE_VAL (512)
#define TYPE_TOLERANCE (10) #define TYPE_TOLERANCE (10)
#define TYPE_NO_MODULE_STARTING_VAL (800) #define TYPE_NO_MODULE_STARTING_VAL (800)
#define INITIAL_STARTUP_WAIT (1 * 1000 * 1000)
/** Default Parameters */ /** Default Parameters */
#define DEFAULT_BURST_MODE (BURST_INTERNAL) #define DEFAULT_BURST_MODE (BURST_INTERNAL)
#define DEFAULT_NUM_FRAMES (1) #define DEFAULT_NUM_FRAMES (1)
#define DEFAULT_NUM_CYCLES (1) #define DEFAULT_NUM_CYCLES (1)
#define DEFAULT_EXPTIME (0) // 0 ms (220ns in firmware) #define DEFAULT_EXPTIME (0) // 0 ms (220ns in firmware)
#define DEFAULT_PERIOD (1 * 1000) // 1 ms #define DEFAULT_PERIOD (0) // 1 ms
#define DEFAULT_DELAY_AFTER_TRIGGER (0) #define DEFAULT_DELAY_AFTER_TRIGGER (0)
#define DEFAULT_HIGH_VOLTAGE (0) #define DEFAULT_HIGH_VOLTAGE (0)
#define DEFAULT_TIMING_MODE (AUTO_TIMING) #define DEFAULT_TIMING_MODE (AUTO_TIMING)