diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 1df56bbe0..21c696dfd 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index 490129740..b7d506bfa 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ diff --git a/slsDetectorServers/slsDetectorServer/src/loadPattern.c b/slsDetectorServers/slsDetectorServer/src/loadPattern.c index 17c0d003d..f9010ac10 100644 --- a/slsDetectorServers/slsDetectorServer/src/loadPattern.c +++ b/slsDetectorServers/slsDetectorServer/src/loadPattern.c @@ -11,7 +11,7 @@ #ifdef MYTHEN3D extern enum TLogLevel trimmingPrint; -extern uint32_t clkDivider[]; +extern int getFrequency(enum CLKINDEX ind); #endif #if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD) extern uint32_t clkFrequency[]; @@ -309,7 +309,7 @@ uint64_t getPatternWaitInterval(int level) { #if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD) runclk = clkFrequency[RUN_CLK]; #elif MYTHEN3D - runclk = clkDivider[SYSTEM_C0]; + runclk = getFrequency(SYSTEM_C0); #endif if (runclk == 0) { LOG(logERROR, ("runclk is 0. Cannot divide by 0. Returning -1.\n")); @@ -356,7 +356,7 @@ int validate_setPatternWaitClocksAndInterval(char *message, int level, #if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD) runclk = clkFrequency[RUN_CLK]; #elif MYTHEN3D - runclk = clkDivider[SYSTEM_C0]; + runclk = getFrequency(SYSTEM_C0); #endif if (retval == (uint64_t)-1) { sprintf(message, "runclk is 0. Cannot divide by 0 for patttern " @@ -403,7 +403,7 @@ void setPatternWaitInterval(int level, uint64_t t) { #if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD) runclk = clkFrequency[RUN_CLK]; #elif MYTHEN3D - runclk = clkDivider[SYSTEM_C0]; + runclk = getFrequency(SYSTEM_C0); #endif uint64_t numClocks = ns_to_clocks(t, runclk); setPatternWaitClocks(level, numClocks); diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer index 6dccc129b..600c1e6a0 100755 Binary files a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer and b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer differ diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c index 1100bd9e0..a95e8718f 100644 --- a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c @@ -817,7 +817,7 @@ int setPeriod(int64_t val, char *mess) { } int getPeriod(int64_t *retval, char *mess) { - if (clkFrequency[SYNC_CLK] == 0) { + if (clkFrequency[RUN_CLK] == 0) { sprintf(mess, "Cannot get period. Run clock frequency is 0.\n"); LOG(logERROR, (mess)); return FAIL;