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

gotthard compiles

Browse Source
This commit is contained in:
maliakal_d
2018-11-08 18:09:11 +01:00
parent a37be4b2e3
commit 2e37eda9d9
10 changed files with 72 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorServers/gotthardDetectorServer/RegisterDefs.h
View File

@ -158,10 +158,10 @@
/* Fix Pattern register */
#define FIX_PATT_REG (0x23 << MEM_MAP_SHIFT)
#define FIXED_PATT_VAL (0xACDC1980)
#define FIX_PATT_VAL (0xACDC1980)
/** Config register */
#define Config_REG (0x26 << MEM_MAP_SHIFT)
#define CONFIG_REG (0x26 << MEM_MAP_SHIFT)
#define CONFIG_SLAVE_OFST (0) // Not used in FW & SW
#define CONFIG_SLAVE_MSK (0x00000001 << CONFIG_SLAVE_OFST)
@ -266,7 +266,7 @@
#define DETECTOR_TYPE_MOENCH_VAL (2)
/* 16 bit Fifo Data register */
//#define FIFO_DATA_REG (0x50 << MEM_MAP_SHIFT) // Not used in FW and SW (16bit)
#define FIFO_DATA_REG (0x50 << MEM_MAP_SHIFT) // Not used in FW and SW (16bit)
/*
#define MOD_DACS1_REG 0x65<<11