diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_refactor b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_refactor index 7745ef80d..8bade9afd 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_refactor and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_refactor differ diff --git a/slsDetectorServers/gotthardDetectorServer/gitInfo.txt b/slsDetectorServers/gotthardDetectorServer/gitInfo.txt index 9e4f965f2..ebb05f210 100644 --- a/slsDetectorServers/gotthardDetectorServer/gitInfo.txt +++ b/slsDetectorServers/gotthardDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorPackage/slsDetectorServers/gotthardDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 06a6d53a3f1c5aeeced47475057f956b72d9a74f -Revision: 15 +Repsitory UUID: 553633651a7549b13ea314c887c49dd296c075d5 +Revision: 18 Branch: refactor Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4200 -Last Changed Date: 2019-01-07 12:06:28.000000002 +0100 ./.target-makefrag +Last Changed Rev: 4203 +Last Changed Date: 2019-01-08 06:54:17.000000002 +0100 ./RegisterDefs.h diff --git a/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h index 8e66ba82a..8ed541aab 100644 --- a/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h +++ b/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "06a6d53a3f1c5aeeced47475057f956b72d9a74f" +#define GITREPUUID "553633651a7549b13ea314c887c49dd296c075d5" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4200 -#define GITDATE 0x20190107 +#define GITREV 0x4203 +#define GITDATE 0x20190108 #define GITBRANCH "refactor" diff --git a/slsDetectorServers/slsDetectorServer/AD9252.h b/slsDetectorServers/slsDetectorServer/AD9252.h index 1c20d114b..580fd805e 100755 --- a/slsDetectorServers/slsDetectorServer/AD9252.h +++ b/slsDetectorServers/slsDetectorServer/AD9252.h @@ -154,25 +154,22 @@ void AD9252_Configure(){ //power mode reset FILE_LOG(logINFO, ("\tPower mode reset\n")); AD9252_Set(AD9252_POWER_MODE_REG, AD9252_INT_RESET_VAL); -/*#ifdef GOTTHARDD //FIXME:? - usleep(50000); -#endif*/ //power mode chip run FILE_LOG(logINFO, ("\tPower mode chip run\n")); AD9252_Set(AD9252_POWER_MODE_REG, AD9252_INT_CHIP_RUN_VAL); -#ifdef GOTTHARDD - /*usleep(50000);*///FIXME:? // binary offset FILE_LOG(logINFO, ("\tBinary offset\n")); AD9252_Set(AD9252_OUT_MODE_REG, AD9252_OUT_BINARY_OFST_VAL); - /*usleep(50000);*///FIXME:? -#endif //output clock phase - FILE_LOG(logINFO, ("\tOutput clock phase\n")); - AD9252_Set(AD9252_OUT_PHASE_REG, AD9252_OUT_CLK_60_VAL); +#ifdef GOTTHARDD + FILE_LOG(logINFO, ("\tOutput clock phase is at default: 180\n")); +#else + FILE_LOG(logINFO, ("\tOutput clock phase: 60\n")); + AD9257_Set(AD9257_OUT_PHASE_REG, AD9257_OUT_CLK_60_VAL); +#endif // lvds-iee reduced , binary offset FILE_LOG(logINFO, ("\tLvds-iee reduced, binary offset\n")); @@ -184,7 +181,7 @@ void AD9252_Configure(){ AD9252_CHAN_H_MSK | AD9252_CHAN_G_MSK | AD9252_CHAN_F_MSK | AD9252_CHAN_E_MSK); AD9252_Set(AD9252_DEV_IND_1_REG, AD9252_CHAN_D_MSK | AD9252_CHAN_C_MSK | AD9252_CHAN_B_MSK | AD9252_CHAN_A_MSK | - AD9252_CLK_CH_DCO_MSK | AD9252_CLK_CH_IFCO_MSK); // unlike 9257, by default ad9252 has this (dco and ifco)off + AD9252_CLK_CH_DCO_MSK | AD9252_CLK_CH_IFCO_MSK); // no test mode FILE_LOG(logINFO, ("\tNo test mode\n"));