diff --git a/slsDetectorServers/ctbDetectorServer/gitInfo.txt b/slsDetectorServers/ctbDetectorServer/gitInfo.txt index ce0afee43..b19c3611d 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: 44f0dfc3c00d0dd70a683289dde9a2fcbf1e0449 -Revision: 42 +Repsitory UUID: 050854de36f01379e974005e204b6563ffbc7004 +Revision: 43 Branch: refactor Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4450 -Last Changed Date: 2019-03-20 12:35:24.000000002 +0100 ./slsDetectorFunctionList.c +Last Changed Rev: 4458 +Last Changed Date: 2019-03-21 14:00:57.000000002 +0100 ../slsDetectorServer/ALTERA_PLL.h diff --git a/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h b/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h index f191daad6..aa7c926b1 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 "44f0dfc3c00d0dd70a683289dde9a2fcbf1e0449" +#define GITREPUUID "050854de36f01379e974005e204b6563ffbc7004" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4450 -#define GITDATE 0x20190320 +#define GITREV 0x4458 +#define GITDATE 0x20190321 #define GITBRANCH "refactor" diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor index 74a53b486..3ccc9226c 100755 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor differ diff --git a/slsDetectorServers/eigerDetectorServer/gitInfo.txt b/slsDetectorServers/eigerDetectorServer/gitInfo.txt index b76b6b82d..0cef631d7 100644 --- a/slsDetectorServers/eigerDetectorServer/gitInfo.txt +++ b/slsDetectorServers/eigerDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorPackage/slsDetectorServers/eigerDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: be331021649ca28d7656355cbb93baf91877b672 -Revision: 27 +Repsitory UUID: d9503bebf9aed76490b8166ef233e5ceeff97547 +Revision: 29 Branch: refactor Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4417 -Last Changed Date: 2019-03-11 14:57:57.000000002 +0100 ./xparameters.h +Last Changed Rev: 4465 +Last Changed Date: 2019-03-21 14:03:50.000000002 +0100 ../slsDetectorServer/ALTERA_PLL.h diff --git a/slsDetectorServers/eigerDetectorServer/gitInfoEiger.h b/slsDetectorServers/eigerDetectorServer/gitInfoEiger.h index 92be9da7d..980278001 100644 --- a/slsDetectorServers/eigerDetectorServer/gitInfoEiger.h +++ b/slsDetectorServers/eigerDetectorServer/gitInfoEiger.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "be331021649ca28d7656355cbb93baf91877b672" +#define GITREPUUID "d9503bebf9aed76490b8166ef233e5ceeff97547" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4417 -#define GITDATE 0x20190311 +#define GITREV 0x4465 +#define GITDATE 0x20190321 #define GITBRANCH "refactor" diff --git a/slsDetectorServers/slsDetectorServer/ALTERA_PLL.h b/slsDetectorServers/slsDetectorServer/ALTERA_PLL.h index b807ba220..361a88087 100755 --- a/slsDetectorServers/slsDetectorServer/ALTERA_PLL.h +++ b/slsDetectorServers/slsDetectorServer/ALTERA_PLL.h @@ -196,15 +196,15 @@ int ALTERA_PLL_SetOuputFrequency (int clkIndex, int pllVCOFreqMhz, int value) { FILE_LOG(logINFO, ("\tC%d: Setting output frequency to %d (pllvcofreq: %dMhz)\n", clkIndex, value, pllVCOFreqMhz)); // calculate output frequency - uint32_t total_div = pllVCOFreqMhz / value; + float total_div = (float)pllVCOFreqMhz / (float)value; // assume 50% duty cycle uint32_t low_count = total_div / 2; uint32_t high_count = low_count; uint32_t odd_division = 0; - + cprintf(RED, "toatldiv:%f\n", total_div); // odd division - if (total_div > (2 * low_count)) { + if (total_div > (float)(2 * low_count)) { ++high_count; odd_division = 1; }