From a127f8c97a1fe86c218ad829f72d5d085e3542d1 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 14 Jul 2021 16:03:13 +0200 Subject: [PATCH] g2: badchanels moved to a new register base --- RELEASE.txt | 7 ++++--- .../gotthard2DetectorServer/RegisterDefs.h | 15 ++++++++++----- .../slsDetectorServer_defs.h | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index 0af457ab5..6123205c5 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -28,10 +28,11 @@ This document describes the differences between 5.1.0 and 5.0.1 releases. 4. Mythen3, API function to set pattern from memory - Mythen3 server - ----------------- + Gotthard2 server + ---------------- - 1. Setting timing to auto, sets timing to trigger for slaves + 1. Bad Channels moved to a new register + 2. Resolved Issues diff --git a/slsDetectorServers/gotthard2DetectorServer/RegisterDefs.h b/slsDetectorServers/gotthard2DetectorServer/RegisterDefs.h index 378aed102..9167f84c9 100644 --- a/slsDetectorServers/gotthard2DetectorServer/RegisterDefs.h +++ b/slsDetectorServers/gotthard2DetectorServer/RegisterDefs.h @@ -34,6 +34,9 @@ #define BASE_FLOW_CONTROL (0x00200) // 0x1806_0200 - 0x1806_02FF // https://git.psi.ch/sls_detectors_firmware/vhdl_library/blob/f37608230b4721661f29aacc20124555705ee705/flow/flow_ctrl.vhd +/** Veto processing core */ +#define BASE_VETO_PRCSSNG (0x0300) // 0x1806_0300 - 0x1806_03FF? + /* UDP datagram generator */ #define BASE_UDP_RAM (0x01000) // 0x1806_1000 - 0x1806_1FFF @@ -110,10 +113,6 @@ /** DTA Offset Register */ #define DTA_OFFSET_REG (0x0A * REG_OFFSET + BASE_CONTROL) -/** Mask Strip Registers (40) */ -#define MASK_STRIP_START_REG (0x18 * REG_OFFSET + BASE_CONTROL) -#define MASK_STRIP_NUM_REGS (40) - /* ASIC registers --------------------------------------------------*/ /* ASIC Config register */ @@ -258,4 +257,10 @@ #define RXR_ENDPOINTS_MAX (32) #define RXR_ENDPOINT_OFST (16 * REG_OFFSET) -// clang-format on \ No newline at end of file + +/** Veto processing core --------------------------------------------------*/ +/** Mask Strip Registers (40) */ +#define MASK_STRIP_START_REG (0x00 * REG_OFFSET + BASE_VETO_PRCSSNG) +#define MASK_STRIP_NUM_REGS (40) + +// clang-format on diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h index 43a427489..0fd98ef94 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h @@ -1,7 +1,7 @@ #pragma once #include "sls/sls_detector_defs.h" -#define REQRD_FRMWRE_VRSN (0x200925) +#define REQRD_FRMWRE_VRSN (0x210714) #define KERNEL_DATE_VRSN "Wed May 20 13:58:38 CEST 2020" #define CTRL_SRVR_INIT_TIME_US (300 * 1000)