From e6f475d7c4393caa36da19f78a30f0e6418c1728 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 2 Feb 2018 12:37:52 +0100 Subject: [PATCH] jungfrau server changes in temperature control for fpga bug: default temp threshold and temp event cleared at start and power reg only reads enable and not status --- .../jungfrauDetectorServer/gitInfo.txt | 10 +++++----- .../jungfrauDetectorServer/gitInfoJungfrau.h | 8 ++++---- .../jungfrauDetectorServer/slsDetectorFunctionList.c | 11 ++++++++++- .../jungfrauDetectorServer/slsDetectorServer_defs.h | 1 + 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt index 269c385ab..1a59c8d73 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 68d6c514a9b9c0f44e53e212f88f29349037c891 -Revision: 96 -Branch: jungfrauchanges +Repsitory UUID: aebc423fb2907635588f8e1b8a70a0eb6f5b5a6f +Revision: 103 +Branch: 3.0.1 Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 3332 -Last Changed Date: 2018-01-11 08:42:43.000000002 +0100 ./RegisterDefs.h +Last Changed Rev: 3341 +Last Changed Date: 2018-02-02 10:48:32.000000002 +0100 ./RegisterDefs.h diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h index bc7f1a3cf..028a9884a 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h +++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "68d6c514a9b9c0f44e53e212f88f29349037c891" +#define GITREPUUID "aebc423fb2907635588f8e1b8a70a0eb6f5b5a6f" #define GITAUTH "Dhanya_Maliakal" -#define GITREV 0x3332 -#define GITDATE 0x20180111 -#define GITBRANCH "jungfrauchanges" +#define GITREV 0x3341 +#define GITDATE 0x20180202 +#define GITBRANCH "3.0.1" diff --git a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c index 9e8e94146..b44c89f2c 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -362,6 +362,12 @@ void setupDetector() { /*setSpeed(CLOCK_DIVIDER, HALF_SPEED); depends if all the previous stuff works*/ setTiming(DEFAULT_TIMING_MODE); setHighVoltage(DEFAULT_HIGH_VOLTAGE); + + /* temporary set up until new firmware fixes bug */ + // set temperature threshold + setThresholdTemperature(DEFAULT_TMP_THRSHLD); + // reset temp event + setTemperatureEvent(0); } @@ -383,7 +389,10 @@ int powerChip (int on){ bus_w(CHIP_POWER_REG, bus_r(CHIP_POWER_REG) & ~CHIP_POWER_ENABLE_MSK); } } - return (bus_r(CHIP_POWER_REG & CHIP_POWER_STATUS_MSK) >> CHIP_POWER_STATUS_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); } void cleanFifos() { diff --git a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h index b2710e94e..7d818ae51 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h @@ -86,6 +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 /* Defines in the Firmware */ #define FIX_PATT_VAL (0xACDC2014)