diff --git a/RELEASE.txt b/RELEASE.txt index 12a2aa277..fc22be042 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -93,6 +93,8 @@ This document describes the differences between v7.0.0 and v6.x.x - g2 parallel command - jungfrau sync - ctb and moench Fw fixed (to work with pattern commdand) )addreess length +- jungfrau reset core and usleep removed (fix for 6.1.1 is now fixed in firmware) + 2. Resolved Issues ================== diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index ddf8f2f3e..a89ba6c98 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 1b335ce7f..e237716f8 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -2738,9 +2738,6 @@ int stopStateMachine() { bus_w(CONTROL_REG, bus_r(CONTROL_REG) & ~CONTROL_STOP_ACQ_MSK); LOG(logINFO, ("Status Register: %08x\n", bus_r(STATUS_REG))); - - usleep(100 * 1000); - resetCore(); return OK; } diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h index 2e7e7a61a..f10798186 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h @@ -5,8 +5,8 @@ #include "sls/sls_detector_defs.h" #define MIN_REQRD_VRSN_T_RD_API 0x171220 -#define REQRD_FRMWRE_VRSN_BOARD2 0x210831 // 1.0 pcb (version = 010) -#define REQRD_FRMWRE_VRSN 0x211008 // 2.0 pcb (version = 011) +#define REQRD_FRMWRE_VRSN_BOARD2 0x220421 // 1.0 pcb (version = 010) +#define REQRD_FRMWRE_VRSN 0x220422 // 2.0 pcb (version = 011) #define LINKED_SERVER_NAME "jungfrauDetectorServer" diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 743a0bcce..0771b1fd6 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -7,8 +7,8 @@ #define APIGUI 0x220609 #define APIGOTTHARD 0x220816 #define APIEIGER 0x220816 -#define APIJUNGFRAU 0x220816 #define APIMYTHEN3 0x220822 #define APICTB 0x220825 #define APIMOENCH 0x220825 #define APIGOTTHARD2 0x220830 +#define APIJUNGFRAU 0x220831