detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 07:20:01 +02:00
Code Issues Actions Packages Releases Activity

ctb/moench server: clock fix, max shifts per clock is calculated everytime

Browse Source
This commit is contained in:
maliakal_d 2019-03-25 14:41:15 +01:00
parent c15e72510c
commit 8c2ee57591
8 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorServers/ctbDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 050854de36f01379e974005e204b6563ffbc7004 Repsitory UUID: c15e72510ca9e11eeb234e94dae47c6e3c163c3b
Revision: 43 Revision: 44
Branch: refactor Branch: refactor
Last Changed Author: Dhanya_Thattil Last Changed Author: Gemma_Tinti
Last Changed Rev: 4458 Last Changed Rev: 4473
Last Changed Date: 2019-03-21 14:00:57.000000002 +0100 ../slsDetectorServer/ALTERA_PLL.h Last Changed Date: 2019-03-25 14:39:58.000000002 +0100 ./slsDetectorFunctionList.c

8
slsDetectorServers/ctbDetectorServer/gitInfoCtb.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "050854de36f01379e974005e204b6563ffbc7004" #define GITREPUUID "c15e72510ca9e11eeb234e94dae47c6e3c163c3b"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Gemma_Tinti"
#define GITREV 0x4458 #define GITREV 0x4473
#define GITDATE 0x20190321 #define GITDATE 0x20190325
#define GITBRANCH "refactor" #define GITBRANCH "refactor"

4
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -1656,7 +1656,9 @@ void configurePhase(enum CLKINDEX ind, int val) {
int phase = 0; 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 // delay clk
if (relativePhase > 0) { if (relativePhase > 0) {

3
slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
View File

@ -80,8 +80,7 @@ enum DACINDEX {D0, D1, D2, D3, D4, D5, D6, D7, D8, D9,
/* Defines in the Firmware */ /* Defines in the Firmware */
#define MAX_PATTERN_LENGTH (0xFFFF) #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 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_STEPS (8)
#define MAX_PHASE_SHIFTS_DBIT_CLK (32)
#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_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) #define WAIT_TIME_US_PLL (10 * 1000)

14
slsDetectorServers/moenchDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/moenchDetectorServer Path: slsDetectorPackage/slsDetectorServers/moenchDetectorServer
URL: origin https://www.github.com/slsdetectorgroup/slsDetectorPackage URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin https://www.github.com/slsdetectorgroup/slsDetectorPackage Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 6765fd0dc89176b4eceaf5e2304ef808a316ba9b Repsitory UUID: c15e72510ca9e11eeb234e94dae47c6e3c163c3b
Revision: 16 Revision: 20
Branch: refactor Branch: refactor
Last Changed Author: Dhanya_Thattil Last Changed Author: Gemma_Tinti
Last Changed Rev: 4394 Last Changed Rev: 4473
Last Changed Date: 2019-03-13 08:04:56.000000002 +0100 ./RegisterDefs.h Last Changed Date: 2019-03-25 14:39:22.000000002 +0100 ./slsDetectorFunctionList.c

10
slsDetectorServers/moenchDetectorServer/gitInfoMoench.h
View File

@ -1,6 +1,6 @@
#define GITURL "https://www.github.com/slsdetectorgroup/slsDetectorPackage" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "6765fd0dc89176b4eceaf5e2304ef808a316ba9b" #define GITREPUUID "c15e72510ca9e11eeb234e94dae47c6e3c163c3b"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Gemma_Tinti"
#define GITREV 0x4394 #define GITREV 0x4473
#define GITDATE 0x20190313 #define GITDATE 0x20190325
#define GITBRANCH "refactor" #define GITBRANCH "refactor"

4
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -1292,7 +1292,9 @@ void configurePhase(enum CLKINDEX ind, int val) {
int phase = 0; 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 // delay clk
if (relativePhase > 0) { if (relativePhase > 0) {

3
slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h
View File

@ -61,8 +61,7 @@ enum DACINDEX {D0, D1, D2, D3, D4, D5, D6, D7};
/* Defines in the Firmware */ /* Defines in the Firmware */
#define MAX_PATTERN_LENGTH (0xFFFF) #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 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_STEPS (8)
#define MAX_PHASE_SHIFTS_DBIT_CLK (32)
#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_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) #define WAIT_TIME_US_PLL (10 * 1000)