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

3.1.3: Bug fix: jungfrau server: delay after trigger always set to 5 seconds

Browse Source
This commit is contained in:
maliakal_d
2018-06-28 15:31:09 +02:00
parent e599bfe56f
commit 35fc52dae7
14 changed files with 96 additions and 79 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 << 11)
/* Get Delay 64 bit register */
#define GET_DELAY_LSB_REG (0x12 << 11)
#define GET_DELAY_MSB_REG (0x13 << 11)
#define GET_DELAY_LSB_REG (0x12 << 11) // different kind of delay
#define GET_DELAY_MSB_REG (0x13 << 11) // different kind of delay
/* Get Cycles 64 bit register */
#define GET_CYCLES_LSB_REG (0x14 << 11)
@ -321,8 +321,8 @@
/* Set Delay 64 bit register */
#define SET_DELAY_LSB_REG (0x60 << 11)
#define SET_DELAY_MSB_REG (0x61 << 11)
#define SET_DELAY_LSB_REG (0x60 << 11) // different kind of delay
#define SET_DELAY_MSB_REG (0x61 << 11) // different kind of delay
/* Set Cycles 64 bit register */
#define SET_CYCLES_LSB_REG (0x62 << 11)