From 8c2ee575914dbdd66a9ff5c519ae0ffdb478f14e Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 25 Mar 2019 14:41:15 +0100 Subject: [PATCH] ctb/moench server: clock fix, max shifts per clock is calculated everytime --- slsDetectorServers/ctbDetectorServer/gitInfo.txt | 10 +++++----- slsDetectorServers/ctbDetectorServer/gitInfoCtb.h | 8 ++++---- .../ctbDetectorServer/slsDetectorFunctionList.c | 4 +++- .../ctbDetectorServer/slsDetectorServer_defs.h | 3 +-- .../moenchDetectorServer/gitInfo.txt | 14 +++++++------- .../moenchDetectorServer/gitInfoMoench.h | 10 +++++----- .../moenchDetectorServer/slsDetectorFunctionList.c | 4 +++- .../moenchDetectorServer/slsDetectorServer_defs.h | 3 +-- 8 files changed, 29 insertions(+), 27 deletions(-) diff --git a/slsDetectorServers/ctbDetectorServer/gitInfo.txt b/slsDetectorServers/ctbDetectorServer/gitInfo.txt index b19c3611d..01013c20b 100644 --- a/slsDetectorServers/ctbDetectorServer/gitInfo.txt +++ b/slsDetectorServers/ctbDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 050854de36f01379e974005e204b6563ffbc7004 -Revision: 43 +Repsitory UUID: c15e72510ca9e11eeb234e94dae47c6e3c163c3b +Revision: 44 Branch: refactor -Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4458 -Last Changed Date: 2019-03-21 14:00:57.000000002 +0100 ../slsDetectorServer/ALTERA_PLL.h +Last Changed Author: Gemma_Tinti +Last Changed Rev: 4473 +Last Changed Date: 2019-03-25 14:39:58.000000002 +0100 ./slsDetectorFunctionList.c diff --git a/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h b/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h index aa7c926b1..d91f069ec 100644 --- a/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h +++ b/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "050854de36f01379e974005e204b6563ffbc7004" -#define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4458 -#define GITDATE 0x20190321 +#define GITREPUUID "c15e72510ca9e11eeb234e94dae47c6e3c163c3b" +#define GITAUTH "Gemma_Tinti" +#define GITREV 0x4473 +#define GITDATE 0x20190325 #define GITBRANCH "refactor" diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index bec93f899..16f6f6dc5 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -1656,7 +1656,9 @@ void configurePhase(enum CLKINDEX ind, int val) { int phase = 0; - int maxShifts = ((ind == ADC_CLK) ? MAX_PHASE_SHIFTS_ADC_CLK : MAX_PHASE_SHIFTS_DBIT_CLK); + int maxShifts = (PLL_VCO_FREQ_MHZ / clkDivider[ind]) * MAX_PHASE_SHIFTS_STEPS; + FILE_LOG(logDEBUG1, ("Clock: %d MHz, VCO:%d MHz, Max Phase shifts:%d\n", + clkDivider[ind], PLL_VCO_FREQ_MHZ, maxShifts)); // delay clk if (relativePhase > 0) { diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h index a160b912f..727aec507 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h @@ -80,8 +80,7 @@ enum DACINDEX {D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, /* Defines in the Firmware */ #define MAX_PATTERN_LENGTH (0xFFFF) #define DIGITAL_IO_DELAY_MAXIMUM_PS ((OUTPUT_DELAY_0_OTPT_STTNG_MSK >> OUTPUT_DELAY_0_OTPT_STTNG_OFST) * OUTPUT_DELAY_0_OTPT_STTNG_STEPS) -#define MAX_PHASE_SHIFTS_ADC_CLK (320) -#define MAX_PHASE_SHIFTS_DBIT_CLK (32) +#define MAX_PHASE_SHIFTS_STEPS (8) #define WAIT_TME_US_FR_ACQDONE_REG (100) // wait time in us after acquisition done to ensure there is no data in fifo #define WAIT_TIME_US_PLL (10 * 1000) diff --git a/slsDetectorServers/moenchDetectorServer/gitInfo.txt b/slsDetectorServers/moenchDetectorServer/gitInfo.txt index ac12c4a00..c1b309eec 100644 --- a/slsDetectorServers/moenchDetectorServer/gitInfo.txt +++ b/slsDetectorServers/moenchDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorPackage/slsDetectorServers/moenchDetectorServer -URL: origin https://www.github.com/slsdetectorgroup/slsDetectorPackage -Repository Root: origin https://www.github.com/slsdetectorgroup/slsDetectorPackage -Repsitory UUID: 6765fd0dc89176b4eceaf5e2304ef808a316ba9b -Revision: 16 +URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git +Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git +Repsitory UUID: c15e72510ca9e11eeb234e94dae47c6e3c163c3b +Revision: 20 Branch: refactor -Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4394 -Last Changed Date: 2019-03-13 08:04:56.000000002 +0100 ./RegisterDefs.h +Last Changed Author: Gemma_Tinti +Last Changed Rev: 4473 +Last Changed Date: 2019-03-25 14:39:22.000000002 +0100 ./slsDetectorFunctionList.c diff --git a/slsDetectorServers/moenchDetectorServer/gitInfoMoench.h b/slsDetectorServers/moenchDetectorServer/gitInfoMoench.h index 9c24f9052..d91f069ec 100644 --- a/slsDetectorServers/moenchDetectorServer/gitInfoMoench.h +++ b/slsDetectorServers/moenchDetectorServer/gitInfoMoench.h @@ -1,6 +1,6 @@ -#define GITURL "https://www.github.com/slsdetectorgroup/slsDetectorPackage" -#define GITREPUUID "6765fd0dc89176b4eceaf5e2304ef808a316ba9b" -#define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4394 -#define GITDATE 0x20190313 +#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" +#define GITREPUUID "c15e72510ca9e11eeb234e94dae47c6e3c163c3b" +#define GITAUTH "Gemma_Tinti" +#define GITREV 0x4473 +#define GITDATE 0x20190325 #define GITBRANCH "refactor" diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c index e7cc8e469..ed796eccd 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c @@ -1292,7 +1292,9 @@ void configurePhase(enum CLKINDEX ind, int val) { int phase = 0; - int maxShifts = ((ind == ADC_CLK) ? MAX_PHASE_SHIFTS_ADC_CLK : MAX_PHASE_SHIFTS_DBIT_CLK); + int maxShifts = (PLL_VCO_FREQ_MHZ / clkDivider[ind]) * MAX_PHASE_SHIFTS_STEPS; + FILE_LOG(logDEBUG1, ("Clock: %d MHz, VCO:%d MHz, Max Phase shifts:%d\n", + clkDivider[ind], PLL_VCO_FREQ_MHZ, maxShifts)); // delay clk if (relativePhase > 0) { diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h index 4c9cabf60..9e512eb0b 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h @@ -61,8 +61,7 @@ enum DACINDEX {D0, D1, D2, D3, D4, D5, D6, D7}; /* Defines in the Firmware */ #define MAX_PATTERN_LENGTH (0xFFFF) #define DIGITAL_IO_DELAY_MAXIMUM_PS ((OUTPUT_DELAY_0_OTPT_STTNG_MSK >> OUTPUT_DELAY_0_OTPT_STTNG_OFST) * OUTPUT_DELAY_0_OTPT_STTNG_STEPS) -#define MAX_PHASE_SHIFTS_ADC_CLK (320) -#define MAX_PHASE_SHIFTS_DBIT_CLK (32) +#define MAX_PHASE_SHIFTS_STEPS (8) #define WAIT_TME_US_FR_ACQDONE_REG (100) // wait time in us after acquisition done to ensure there is no data in fifo #define WAIT_TIME_US_PLL (10 * 1000)