detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 23:30:03 +02:00
Code Issues Actions Packages Releases Activity

gotthard2: sleep before configuring on chip dacs, default exptime 0 and default period to 1ms

Browse Source
This commit is contained in:
maliakal_d 2020-02-04 10:50:01 +01:00
parent 42124ca97c
commit 36bd91daa3
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

5
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -451,10 +451,15 @@ int readConfigFile() {
return initError; return initError;
} }
// require a sleep before and after the rst dac signal
usleep (1 * 1000);
// 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);
FILE* fd = fopen(CONFIG_FILE, "r"); FILE* fd = fopen(CONFIG_FILE, "r");
if(fd == NULL) { if(fd == NULL) {
sprintf(initErrorMessage, "Could not open on-board detector server config file [%s].\n", CONFIG_FILE); sprintf(initErrorMessage, "Could not open on-board detector server config file [%s].\n", CONFIG_FILE);

4
slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
View File

@ -32,8 +32,8 @@
#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 (1 * 1000 * 1000) // 1 ms #define DEFAULT_EXPTIME (0) // 0 ms (220ns in firmware)
#define DEFAULT_PERIOD (1 * 1000 * 1000 * 1000) // 1 s #define DEFAULT_PERIOD (1 * 1000) // 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)

2
slsSupportLib/include/versionAPI.h
View File

@ -8,5 +8,5 @@
#define APICTB 0x200131 #define APICTB 0x200131
#define APIJUNGFRAU 0x200131 #define APIJUNGFRAU 0x200131
#define APIMOENCH 0x200131 #define APIMOENCH 0x200131
#define APIGOTTHARD2 0x200131
#define APIMYTHEN3 0x200130 #define APIMYTHEN3 0x200130
#define APIGOTTHARD2 0x200204