From 1872deb1dd968661454eb967210227a9f98e1b71 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 2 Feb 2018 15:17:40 +0100 Subject: [PATCH] fix for temperature workaround for fpga --- .../jungfrauDetectorServer/slsDetectorFunctionList.c | 4 ++-- .../jungfrauDetectorServer/slsDetectorServer_defs.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c index b44c89f2c..164ae5f71 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -390,9 +390,9 @@ int powerChip (int on){ } } - return (bus_r(CHIP_POWER_REG & CHIP_POWER_ENABLE_MSK) >> CHIP_POWER_ENABLE_OFST); + return ((bus_r(CHIP_POWER_REG) & CHIP_POWER_ENABLE_MSK) >> CHIP_POWER_ENABLE_OFST); /* temporary setup until new firmware fixes bug */ - //return (bus_r(CHIP_POWER_REG & CHIP_POWER_STATUS_MSK) >> CHIP_POWER_STATUS_OFST); + //return ((bus_r(CHIP_POWER_REG) & CHIP_POWER_STATUS_MSK) >> CHIP_POWER_STATUS_OFST); } void cleanFifos() { diff --git a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h index 7d818ae51..c3002121e 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h @@ -86,7 +86,7 @@ enum NETWORKINDEX { TXN_FRAME }; #define DEFAULT_TIMING_MODE (AUTO_TIMING) #define DEFAULT_SETTINGS (DYNAMICGAIN) #define DEFAULT_TX_UDP_PORT (0x7e9a) -#define DEFAULT_TMP_THRSHLD (65) //degree Celsius +#define DEFAULT_TMP_THRSHLD (65*1000) //milli degree Celsius /* Defines in the Firmware */ #define FIX_PATT_VAL (0xACDC2014)