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

gotthard server fixed: also for revision 1 boards

Browse Source
This commit is contained in:
maliakal_d 2019-01-08 11:52:14 +01:00
parent 553633651a
commit 81a49babda
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_refactor
View File

Binary file not shown.

8
slsDetectorServers/gotthardDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/gotthardDetectorServer Path: slsDetectorPackage/slsDetectorServers/gotthardDetectorServer
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: 06a6d53a3f1c5aeeced47475057f956b72d9a74f Repsitory UUID: 553633651a7549b13ea314c887c49dd296c075d5
Revision: 15 Revision: 18
Branch: refactor Branch: refactor
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4200 Last Changed Rev: 4203
Last Changed Date: 2019-01-07 12:06:28.000000002 +0100 ./.target-makefrag Last Changed Date: 2019-01-08 06:54:17.000000002 +0100 ./RegisterDefs.h

6
slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.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 "06a6d53a3f1c5aeeced47475057f956b72d9a74f" #define GITREPUUID "553633651a7549b13ea314c887c49dd296c075d5"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4200 #define GITREV 0x4203
#define GITDATE 0x20190107 #define GITDATE 0x20190108
#define GITBRANCH "refactor" #define GITBRANCH "refactor"

17
slsDetectorServers/slsDetectorServer/AD9252.h
View File

@ -154,25 +154,22 @@ void AD9252_Configure(){
//power mode reset //power mode reset
FILE_LOG(logINFO, ("\tPower mode reset\n")); FILE_LOG(logINFO, ("\tPower mode reset\n"));
AD9252_Set(AD9252_POWER_MODE_REG, AD9252_INT_RESET_VAL); AD9252_Set(AD9252_POWER_MODE_REG, AD9252_INT_RESET_VAL);
/*#ifdef GOTTHARDD //FIXME:?
usleep(50000);
#endif*/
//power mode chip run //power mode chip run
FILE_LOG(logINFO, ("\tPower mode chip run\n")); FILE_LOG(logINFO, ("\tPower mode chip run\n"));
AD9252_Set(AD9252_POWER_MODE_REG, AD9252_INT_CHIP_RUN_VAL); AD9252_Set(AD9252_POWER_MODE_REG, AD9252_INT_CHIP_RUN_VAL);
#ifdef GOTTHARDD
/*usleep(50000);*///FIXME:?
// binary offset // binary offset
FILE_LOG(logINFO, ("\tBinary offset\n")); FILE_LOG(logINFO, ("\tBinary offset\n"));
AD9252_Set(AD9252_OUT_MODE_REG, AD9252_OUT_BINARY_OFST_VAL); AD9252_Set(AD9252_OUT_MODE_REG, AD9252_OUT_BINARY_OFST_VAL);
/*usleep(50000);*///FIXME:?
#endif
//output clock phase //output clock phase
FILE_LOG(logINFO, ("\tOutput clock phase\n")); #ifdef GOTTHARDD
AD9252_Set(AD9252_OUT_PHASE_REG, AD9252_OUT_CLK_60_VAL); 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 // lvds-iee reduced , binary offset
FILE_LOG(logINFO, ("\tLvds-iee reduced, binary offset\n")); 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_CHAN_H_MSK | AD9252_CHAN_G_MSK | AD9252_CHAN_F_MSK | AD9252_CHAN_E_MSK);
AD9252_Set(AD9252_DEV_IND_1_REG, AD9252_Set(AD9252_DEV_IND_1_REG,
AD9252_CHAN_D_MSK | AD9252_CHAN_C_MSK | AD9252_CHAN_B_MSK | AD9252_CHAN_A_MSK | 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 // no test mode
FILE_LOG(logINFO, ("\tNo test mode\n")); FILE_LOG(logINFO, ("\tNo test mode\n"));