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

3.1.3: Bug fix: jungfrau server: delay after trigger always set to 5 seconds

Browse Source
This commit is contained in:
maliakal_d
2018-06-28 15:31:09 +02:00
parent e599bfe56f
commit 35fc52dae7
14 changed files with 96 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/jungfrauDetectorServer/RegisterDefs.h
View File

@ -75,8 +75,8 @@
#define TIME_FROM_START_MSB_REG (0x11 << 11)
/* Get Delay 64 bit register */
#define GET_DELAY_LSB_REG (0x12 << 11)
#define GET_DELAY_MSB_REG (0x13 << 11)
#define GET_DELAY_LSB_REG (0x12 << 11) // different kind of delay
#define GET_DELAY_MSB_REG (0x13 << 11) // different kind of delay
/* Get Cycles 64 bit register */
#define GET_CYCLES_LSB_REG (0x14 << 11)
@ -321,8 +321,8 @@
/* Set Delay 64 bit register */
#define SET_DELAY_LSB_REG (0x60 << 11)
#define SET_DELAY_MSB_REG (0x61 << 11)
#define SET_DELAY_LSB_REG (0x60 << 11) // different kind of delay
#define SET_DELAY_MSB_REG (0x61 << 11) // different kind of delay
/* Set Cycles 64 bit register */
#define SET_CYCLES_LSB_REG (0x62 << 11)

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.1.0
View File

Binary file not shown.

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.3.0 Executable file
View File

Binary file not shown.

10
slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
View File

@ -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: 85aa47b8353bb84f52c435a967a03ddf46af5dd1
Revision: 118
Branch: 3.1.1-rc
Repsitory UUID: e599bfe56f512ea6a262483f61ffd8d67d6c6fcd
Revision: 119
Branch: 3.1.3
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3465
Last Changed Date: 2018-03-19 17:26:38.000000002 +0100 ./RegisterDefs.h
Last Changed Rev: 3475
Last Changed Date: 2018-06-28 15:11:57.000000002 +0200 ./RegisterDefs.h

8
slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "85aa47b8353bb84f52c435a967a03ddf46af5dd1"
#define GITREPUUID "e599bfe56f512ea6a262483f61ffd8d67d6c6fcd"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3465
#define GITDATE 0x20180319
#define GITBRANCH "3.1.1-rc"
#define GITREV 0x3475
#define GITDATE 0x20180628
#define GITBRANCH "3.1.3"

15
slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -155,18 +155,21 @@ int testBus() {
printf("\nTesting Bus...\n");
int ret = OK;
u_int32_t addr = SET_DELAY_LSB_REG;
u_int32_t addr = SET_TRIGGER_DELAY_LSB_REG;
int times = 1000 * 1000;
int i = 0;
for (i = 0; i < times; ++i) {
bus_w(addr, i * 100);
if (i * 100 != bus_r(SET_DELAY_LSB_REG)) {
cprintf(RED,"ERROR: Mismatch! Wrote 0x%x, read 0x%x\n", i * 100, bus_r(SET_DELAY_LSB_REG));
if (i * 100 != bus_r(addr)) {
cprintf(RED,"ERROR: Mismatch! Wrote 0x%x, read 0x%x\n",
i * 100, bus_r(addr));
ret = FAIL;
}
}
bus_w(addr, 0);
if (ret == OK)
printf("Successfully tested bus %d times\n", times);
return ret;
@ -697,12 +700,12 @@ int64_t getTimeLeft(enum timerIndex ind){
retval = get64BitReg(GET_PERIOD_LSB_REG, GET_PERIOD_MSB_REG) / (1E-3 * CLK_SYNC);
printf("Getting period left: %lldns\n", (long long int)retval);
break;
/*
case DELAY_AFTER_TRIGGER:
retval = get64BitReg(GET_DELAY_LSB_REG, GET_DELAY_MSB_REG) / (1E-3 * CLK_SYNC);
retval = get64BitReg(xxx) / (1E-3 * CLK_SYNC);
printf("Getting delay left: %lldns\n", (long long int)retval);
break;
*/
case CYCLES_NUMBER:
retval = get64BitReg(GET_CYCLES_LSB_REG, GET_CYCLES_MSB_REG);
printf("Getting number of cycles left: %lld\n", (long long int)retval);