From d976c9fcf9181780be037c4e85201dc632f3451a Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 21 Nov 2019 14:41:54 +0100 Subject: [PATCH] gotthard2: phase direction like mythen3 --- .../bin/gotthard2DetectorServer_developer | Bin 156616 -> 156616 bytes .../slsDetectorFunctionList.c | 18 ++++++++---------- slsSupportLib/include/versionAPI.h | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index ad0fd0c74663d48c8d275d592606c278d551630b..21ed20535b549a06aee429cdbbf703ab71e5738e 100755 GIT binary patch delta 35698 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 359)) { @@ -1022,19 +1022,17 @@ int setPhase(enum CLKINDEX ind, int val, int degrees) { FILE_LOG(logINFO, ("\tNothing to do in Phase Shift\n")); return OK; } - FILE_LOG(logINFOBLUE, ("Configuring Phase\n")); - int phase = 0; - if (relativePhase > 0) { - phase = (maxShift - relativePhase); - } else { - phase = (-1) * relativePhase; - } - FILE_LOG(logDEBUG1, ("\t[Single Direction] Phase:%d (0x%x). Max Phase shifts:%d\n", phase, phase, maxShift)); + int direction = 1; + if (relativePhase < 0) { + relativePhase *= -1; + direction = 0; + } + FILE_LOG(logDEBUG1, ("\tConfiguring Phase: [phase:%d (0x%x), direction:%d]\n", relativePhase, relativePhase, direction)); int pllIndex = ind >= SYSTEM_C0 ? SYSTEM_PLL : READOUT_PLL; int clkIndex = ind >= SYSTEM_C0 ? ind - SYSTEM_C0 : ind; - int ret = ALTERA_PLL_C10_SetPhaseShift(pllIndex, clkIndex, phase, 0); + int ret = ALTERA_PLL_C10_SetPhaseShift(pllIndex, clkIndex, relativePhase, direction); clkPhase[ind] = valShift; return ret; diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index a582e14ad..dff1559f6 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -8,5 +8,5 @@ #define APIGOTTHARD 0x191111 #define APIJUNGFRAU 0x191111 #define APIEIGER 0x191111 -#define APIGOTTHARD2 0x191119 #define APIMYTHEN3 0x191121 +#define APIGOTTHARD2 0x191121