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

jungfrau server fix (3.1.3): delay after trigger set at testbus

Browse Source
This commit is contained in:
maliakal_d
2018-06-28 16:19:19 +02:00
parent 144bd7124b
commit 14d227f8db
4 changed files with 52 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/jungfrauDetectorServer/RegisterDefs.h
View File

@ -75,8 +75,8 @@
#define TIME_FROM_START_MSB_REG (0x11 << MEM_MAP_SHIFT)
/* Get Delay 64 bit register */
#define GET_DELAY_LSB_REG (0x12 << MEM_MAP_SHIFT)
#define GET_DELAY_MSB_REG (0x13 << MEM_MAP_SHIFT)
#define GET_DELAY_LSB_REG (0x12 << MEM_MAP_SHIFT) // different kind of delay
#define GET_DELAY_MSB_REG (0x13 << MEM_MAP_SHIFT) // different kind of delay
/* Get Cycles 64 bit register */
#define GET_CYCLES_LSB_REG (0x14 << MEM_MAP_SHIFT)
@ -349,8 +349,8 @@
/* Set Delay 64 bit register */
#define SET_DELAY_LSB_REG (0x60 << MEM_MAP_SHIFT)
#define SET_DELAY_MSB_REG (0x61 << MEM_MAP_SHIFT)
#define SET_DELAY_LSB_REG (0x60 << MEM_MAP_SHIFT) // different kind of delay
#define SET_DELAY_MSB_REG (0x61 << MEM_MAP_SHIFT) // different kind of delay
/* Set Cycles 64 bit register */
#define SET_CYCLES_LSB_REG (0x62 << MEM_MAP_SHIFT)