detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-14 13:57:13 +02:00
Code Issues Actions Packages Releases Activity

bugfix jungfrau server : tdma bit also needs to be set to enable

Browse Source
This commit is contained in:
maliakal_d
2018-02-26 14:43:11 +01:00
parent 0b017b886c
commit a4aa862ee4
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 9fe7293dab110c00e45a5411921e71d982c8308e Repsitory UUID: 0b017b886c879792b644cf8ec1e1562a520a1205
Revision: 109 Revision: 113
Branch: 3.0.1 Branch: 3.0.1
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3422 Last Changed Rev: 3434
Last Changed Date: 2018-02-23 09:22:07.000000002 +0100 ./Makefile.virtual Last Changed Date: 2018-02-26 13:52:20.000000002 +0100 ./RegisterDefs.h

6
slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "9fe7293dab110c00e45a5411921e71d982c8308e" #define GITREPUUID "0b017b886c879792b644cf8ec1e1562a520a1205"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3422 #define GITREV 0x3434
#define GITDATE 0x20180223 #define GITDATE 0x20180226
#define GITBRANCH "3.0.1" #define GITBRANCH "3.0.1"

4
slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -1327,6 +1327,10 @@ int setNetworkParameter(enum NETWORKINDEX mode, int value) {
printf("\nSetting transmission delay: %d\n", value); printf("\nSetting transmission delay: %d\n", value);
bus_w(CONFIG_REG, (bus_r(CONFIG_REG) &~CONFIG_TDMA_TIMESLOT_MSK) bus_w(CONFIG_REG, (bus_r(CONFIG_REG) &~CONFIG_TDMA_TIMESLOT_MSK)
| (((value << CONFIG_TDMA_TIMESLOT_OFST) & 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 #ifdef VERBOSE
printf("Transmission delay set to %d\n", ((bus_r(CONFIG_REG) & CONFIG_TDMA_TIMESLOT_MSK) >> CONFIG_TDMA_TIMESLOT_OFST)); printf("Transmission delay set to %d\n", ((bus_r(CONFIG_REG) & CONFIG_TDMA_TIMESLOT_MSK) >> CONFIG_TDMA_TIMESLOT_OFST));
#endif #endif