From d9e34e1657af9e5c4adf1b4bdd20d5dcf93caec8 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <33750417+thattil@users.noreply.github.com>
Date: Thu, 29 Sep 2022 14:03:26 +0200
Subject: [PATCH] Pllreset (#560)

* ctb, moench and jungfrau: pll reset at start not happening as no defines
---
 RELEASE.txt                                   |   1 +
 .../bin/ctbDetectorServer_developer           | Bin 317180 -> 317180 bytes
 .../slsDetectorFunctionList.c                 |  12 ++++++------
 .../bin/jungfrauDetectorServer_developer      | Bin 302280 -> 302280 bytes
 .../slsDetectorFunctionList.c                 |  12 ++++++------
 .../bin/moenchDetectorServer_developer        | Bin 305784 -> 305784 bytes
 .../slsDetectorFunctionList.c                 |  11 ++++++-----
 slsSupportLib/include/sls/versionAPI.h        |   6 +++---
 8 files changed, 22 insertions(+), 20 deletions(-)

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 a464414862f0cae0c8b280551be8b22d575d77d1..fbef895c29e0078365b2cef536f65bdc6f91db33 100755
GIT binary patch
delta 303
zcmeyfR`}0a;R%||rkT5@PyEU(vC)Nxi&1lOAeT6!=H^VUoh*}k1mr}y_c1(H-_P*)
zB@@GAerATpdx13bWK(|S;LRr(9#22XkihWRil5=}H9moa4;wfV3^pn}Y+`tr$ORN<
z+s*J;3y59zDm-Lh`mg~=G8$}jNGJfSQG6K2p!AS|h2imx9Sn~T0r9@ctN9hJpC4g(
zEPIsU@!?|*4+G2@fcXF8?Y|D}KDbjL;s4`1zYgqVe7w|;A>qPq9);^W86F!R<uG73
zU;^4#Hkn-@*eK(W!b1lJpsNlmJah!oW<c5rNE-oZXCSQyq+Nit7Le{_V|X0Iy?Kp*
lf;ppR^I7-yv+j&Q%(VTiJM*uPtUDMO`1fo-W65GL7XU4HeOLeh

delta 329
zcmW;HJxIe)5C`x}Qnkcl0)gmes)9HO*@_h;t;K?aU)9d9Zf+eNi-O{&WKcmtTy(I|
zP^5-Ztk(L0Mnnha$AObW9YhU<dOG~y4~_@-zh+)*=C#csX<*mi-uje!oJ2?#bbD6r
z7WCqh>;^Qz$T{GT2-qtDdZcDADE+D0E#T1|Fu+L#@U2T_jY5!_j=@)eXJne|Wxyz9
zzG83?8wGj=)3I3g|4*2wp^rlV@c0byneu4gE8)?vE5PA8;LEkeXCgpp;f-G{U$`o3
z;k#dT1w5Ss_EZiTuP$J$9yB{lk@l_GgKBDS`O@GPP^+53W8?%GC*$NeIYuVPD7n!N
zxY%h>bBmgPXL8e7C&voZ?-0WL0RFB>SBfX95fSuNFS+g|1&Ubml9K<?wgaH-l^#X{
G=Ke2Tql{Jn

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 c32481ef729840672aa3f8da51e30d144550b65a..0f4dc9d266b6e08596922effe0aca8bce11a59fc 100755
GIT binary patch
delta 167
zcmX@HQ|QD_p$VGIrkN+FZ#>E@vC$=kLsFBIF@f;~1A_nq7ywxg50w}g9%^nr$Wh2L
zc@M9e;O7$zkM&P7JkDohcsvt`ohLi;Dy#FJXL$VaJVOG*<1hRI2_H6aBp7T|c-X}7
zFp&!=_US0YW3gilj}0bw^C}8No@RL555%TtLF#8PY<|MK#G6sGxihl8Gm;UAnShvi
KduJqzy)yv1BtEJD

delta 168
zcmX@HQ|QD_p$VGIDl`91-*}W+Vxvn6hol%MV*=v~1_l8JFaWX~9x5>~JQUk}kfV@=
zpW(6dNruPGYz&Xr0&)1{OkQPm#q$i0SuZdoFg)fE5J>p2fg{0Sqr$@`hKGq<Kryys
z43D*d*k$r&UPXc2(+rOn1F`2>koq+YlZ|-QnAV-x{DgOjH=|f{XJmV4BqI<r0WtIT
J&PWz}X8<hJJYWC-

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 443fc129e6c51405490cadfc951d5f43068aff4b..ba35a7793e1b99c3beaca323e42733ebb5af2dfe 100755
GIT binary patch
delta 203
zcmexyMd-&Bp$VGIrkRJPFFemIvC&0@OHz}QF@f;~1A_nq7ywxg50w}g9%^nb<XX>S
ztdQ_wgF}MB#vh3d{skKw5;km9c({l`@!<jnt^|h1^R_ZP-nEV4@h>KZ#|q30kIw;V
zj>*RS%DU5bGd!-^!vIwCkQ+o!;1d9v!~rx(;b9ZQ!$gqo8Jid$?*Za#lbiV!1@3QW
qcr3bu;qmUBAoW#@o3HSz7%*x!|Fm!aY0n76OhC-M{ii)keHH+utWe(o

delta 178
zcmexyMd-&Bp$VGIDl`92UwEEbVxx-)m!udcV*=v~1_l8JFaWX~9x5>~JQUkp$hDqD
znBnoMZ48gOm>C`$0P#I0hQ|_<gZY(pm+fYF+_i@xf#LB-ZV<VEPaxsL295-SjS3H&
z7#=2a0mW8qVt9N8h@VYf%&#c$emlcs)g26vPwxb&?_!*+z%R!XvUT$neiZ{ovF4xl
U?LX}qftU%1nYaJ6XQ|Hu0C5FF{r~^~

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