From a4aa862ee4364420a15d04189431e5a4b96e7fd7 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 26 Feb 2018 14:43:11 +0100 Subject: [PATCH] bugfix jungfrau server : tdma bit also needs to be set to enable --- slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt | 8 ++++---- .../jungfrauDetectorServer/gitInfoJungfrau.h | 6 +++--- .../jungfrauDetectorServer/slsDetectorFunctionList.c | 4 ++++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt index 49a866a24..6c9f772b2 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: 9fe7293dab110c00e45a5411921e71d982c8308e -Revision: 109 +Repsitory UUID: 0b017b886c879792b644cf8ec1e1562a520a1205 +Revision: 113 Branch: 3.0.1 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3422 -Last Changed Date: 2018-02-23 09:22:07.000000002 +0100 ./Makefile.virtual +Last Changed Rev: 3434 +Last Changed Date: 2018-02-26 13:52:20.000000002 +0100 ./RegisterDefs.h diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h index 8dc070c28..adb58a39a 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 "9fe7293dab110c00e45a5411921e71d982c8308e" +#define GITREPUUID "0b017b886c879792b644cf8ec1e1562a520a1205" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3422 -#define GITDATE 0x20180223 +#define GITREV 0x3434 +#define GITDATE 0x20180226 #define GITBRANCH "3.0.1" diff --git a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c index aab9a75f0..3355be706 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -1327,6 +1327,10 @@ int setNetworkParameter(enum NETWORKINDEX mode, int value) { printf("\nSetting transmission delay: %d\n", value); bus_w(CONFIG_REG, (bus_r(CONFIG_REG) &~CONFIG_TDMA_TIMESLOT_MSK) | (((value << CONFIG_TDMA_TIMESLOT_OFST) & CONFIG_TDMA_TIMESLOT_MSK))); + if (value == 0) + bus_w(CONFIG_REG, bus_r(CONFIG_REG) &~ CONFIG_TDMA_MSK); + else + bus_w(CONFIG_REG, bus_r(CONFIG_REG) | CONFIG_TDMA_MSK); #ifdef VERBOSE printf("Transmission delay set to %d\n", ((bus_r(CONFIG_REG) & CONFIG_TDMA_TIMESLOT_MSK) >> CONFIG_TDMA_TIMESLOT_OFST)); #endif