diff --git a/RELEASE.txt b/RELEASE.txt index defa68ec3..757b80126 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -100,6 +100,7 @@ This document describes the differences between v7.0.0 and v6.x.x - jungfrau reset core and usleep removed (fix for 6.1.1 is now fixed in firmware) - g2 change clkdivs 2 3 4 to defaults for burst and cw mode. - ctb and moench: allowing 1g non blocking acquire to send data +- ctb, moench, jungfrau (pll reset at start fixed, before no defines) 2. Resolved Issues ================== diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index a46441486..fbef895c2 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index db095b1db..84c63a4a4 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -488,7 +488,13 @@ void setupDetector() { #endif setupUDPCommParameters(); + // altera pll + ALTERA_PLL_SetDefines(PLL_CNTRL_REG, PLL_PARAM_REG, + PLL_CNTRL_RCNFG_PRMTR_RST_MSK, PLL_CNTRL_WR_PRMTR_MSK, + PLL_CNTRL_PLL_RST_MSK, PLL_CNTRL_ADDR_MSK, + PLL_CNTRL_ADDR_OFST); ALTERA_PLL_ResetPLLAndReconfiguration(); + resetCore(); resetPeripheral(); cleanFifos(); @@ -548,12 +554,6 @@ void setupDetector() { INA226_CalibrateCurrentRegister(I2C_POWER_VD_DEVICE_ID); setVchip(VCHIP_MIN_MV); - // altera pll - ALTERA_PLL_SetDefines(PLL_CNTRL_REG, PLL_PARAM_REG, - PLL_CNTRL_RCNFG_PRMTR_RST_MSK, PLL_CNTRL_WR_PRMTR_MSK, - PLL_CNTRL_PLL_RST_MSK, PLL_CNTRL_ADDR_MSK, - PLL_CNTRL_ADDR_OFST); - setADCInvertRegister(0); // depends on chip LOG(logINFOBLUE, ("Setting Default parameters\n")); diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index c32481ef7..0f4dc9d26 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 584892776..43f6284c7 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -428,7 +428,13 @@ void setupDetector() { setupUDPCommParameters(); #endif + // altera pll + ALTERA_PLL_SetDefines( + PLL_CNTRL_REG, PLL_PARAM_REG, PLL_CNTRL_RCNFG_PRMTR_RST_MSK, + PLL_CNTRL_WR_PRMTR_MSK, PLL_CNTRL_PLL_RST_MSK, PLL_CNTRL_ADDR_MSK, + PLL_CNTRL_ADDR_OFST, PLL_CNTRL_DBIT_WR_PRMTR_MSK, DBIT_CLK_INDEX); ALTERA_PLL_ResetPLL(); + resetCore(); resetPeripheral(); cleanFifos(); @@ -456,12 +462,6 @@ void setupDetector() { LTC2620_Configure(); resetToDefaultDacs(0); - // altera pll - ALTERA_PLL_SetDefines( - PLL_CNTRL_REG, PLL_PARAM_REG, PLL_CNTRL_RCNFG_PRMTR_RST_MSK, - PLL_CNTRL_WR_PRMTR_MSK, PLL_CNTRL_PLL_RST_MSK, PLL_CNTRL_ADDR_MSK, - PLL_CNTRL_ADDR_OFST, PLL_CNTRL_DBIT_WR_PRMTR_MSK, DBIT_CLK_INDEX); - /* Only once at server startup */ bus_w(DAQ_REG, 0x0); diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index 443fc129e..ba35a7793 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c index 7ed5d919e..793936673 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c @@ -503,7 +503,13 @@ void setupDetector() { #endif setupUDPCommParameters(); + // altera pll + ALTERA_PLL_SetDefines(PLL_CNTRL_REG, PLL_PARAM_REG, + PLL_CNTRL_RCNFG_PRMTR_RST_MSK, PLL_CNTRL_WR_PRMTR_MSK, + PLL_CNTRL_PLL_RST_MSK, PLL_CNTRL_ADDR_MSK, + PLL_CNTRL_ADDR_OFST); ALTERA_PLL_ResetPLLAndReconfiguration(); + resetCore(); resetPeripheral(); cleanFifos(); @@ -536,11 +542,6 @@ void setupDetector() { LTC2620_Configure(); resetToDefaultDacs(0); - // altera pll - ALTERA_PLL_SetDefines(PLL_CNTRL_REG, PLL_PARAM_REG, - PLL_CNTRL_RCNFG_PRMTR_RST_MSK, PLL_CNTRL_WR_PRMTR_MSK, - PLL_CNTRL_PLL_RST_MSK, PLL_CNTRL_ADDR_MSK, - PLL_CNTRL_ADDR_OFST); // not using setADCInvertRegister command (as it xors the default) bus_w(ADC_PORT_INVERT_REG, ADC_PORT_INVERT_VAL); diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index cd8b6714f..02248a210 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -5,10 +5,10 @@ #define APILIB 0x220609 #define APIRECEIVER 0x220609 #define APIGUI 0x220609 -#define APICTB 0x220916 #define APIGOTTHARD 0x220916 #define APIGOTTHARD2 0x220916 -#define APIJUNGFRAU 0x220916 #define APIMYTHEN3 0x220916 -#define APIMOENCH 0x220916 #define APIEIGER 0x220916 +#define APICTB 0x220929 +#define APIMOENCH 0x220929 +#define APIJUNGFRAU 0x220929