diff --git a/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h b/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h index c025c36d6..7cf67d78c 100755 --- a/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h +++ b/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h @@ -100,11 +100,13 @@ #define TEMPERATURE_POLARITY_BIT (11) #define TEMPERATURE_POLARITY_MSK (0x00000001 << TEMPERATURE_POLARITY_BIT) - - /* Get Frames from Start 64 bit register (frames from last reset using CONTROL_CRST) */ -#define FRAMES_FROM_START_PG_LSB_REG (0x24 << MEM_MAP_SHIFT) -#define FRAMES_FROM_START_PG_MSB_REG (0x25 << MEM_MAP_SHIFT) +#define FRAMES_FROM_START_LSB_REG (0x22 << MEM_MAP_SHIFT) +#define FRAMES_FROM_START_MSB_REG (0x23 << MEM_MAP_SHIFT) + +/* Get Starting Frame Number */ +#define GET_FRAME_NUMBER_LSB_REG (0x24 << MEM_MAP_SHIFT) +#define GET_FRAME_NUMBER_MSB_REG (0x25 << MEM_MAP_SHIFT) /* Measurement Time 64 bit register (timestamp at a frame start until reset)*/ #define START_FRAME_TIME_LSB_REG (0x26 << MEM_MAP_SHIFT) @@ -388,7 +390,7 @@ #define SET_EXPTIME_LSB_REG (0x68 << MEM_MAP_SHIFT) #define SET_EXPTIME_MSB_REG (0x69 << MEM_MAP_SHIFT) -/* Frame number 64 bit register */ +/* Starting Frame number 64 bit register */ #define FRAME_NUMBER_LSB_REG (0x6A << MEM_MAP_SHIFT) #define FRAME_NUMBER_MSB_REG (0x6B << MEM_MAP_SHIFT) diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 39a4f7cdc..1ccd8ab74 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c index 4476efd6c..99a0aeec2 100755 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -567,7 +567,7 @@ int setStartingFrameNumber(uint64_t value) { int getStartingFrameNumber(uint64_t* retval) { // increment is for firmware - *retval = (getU64BitReg(FRAME_NUMBER_LSB_REG, FRAME_NUMBER_MSB_REG) + 1); + *retval = (getU64BitReg(GET_FRAME_NUMBER_LSB_REG, GET_FRAME_NUMBER_MSB_REG) + 1); return OK; } @@ -694,7 +694,7 @@ int64_t getTimeLeft(enum timerIndex ind){ case FRAMES_FROM_START: case FRAMES_FROM_START_PG: - retval = get64BitReg(FRAMES_FROM_START_PG_LSB_REG, FRAMES_FROM_START_PG_MSB_REG); + retval = get64BitReg(FRAMES_FROM_START_LSB_REG, FRAMES_FROM_START_MSB_REG); FILE_LOG(logINFO, ("Getting frames from start run control %lld\n", (long long int)retval)); break; diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index b498cdf09..234c5ea0d 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -3,8 +3,8 @@ #define APIMOENCH 0x181108 #define APICTB 0x190604 #define APIGOTTHARD 0x190715 -#define APIJUNGFRAU 0x190718 #define APIEIGER 0x190723 #define APILIB 0x190723 #define APIRECEIVER 0x190722 #define APIGUI 0x190723 +#define APIJUNGFRAU 0x190723