diff --git a/serverBin/jungfrauDetectorServerv8.0.0 b/serverBin/jungfrauDetectorServerv8.0.0 deleted file mode 120000 index c99269f21..000000000 --- a/serverBin/jungfrauDetectorServerv8.0.0 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.0 \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServerv8.0.2 b/serverBin/jungfrauDetectorServerv8.0.2 new file mode 120000 index 000000000..ae1efdca0 --- /dev/null +++ b/serverBin/jungfrauDetectorServerv8.0.2 @@ -0,0 +1 @@ +../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.2 \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.0 b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.0 deleted file mode 100755 index b66b818e9..000000000 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.0 and /dev/null differ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.2 b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.2 new file mode 100755 index 000000000..b7d18bab2 Binary files /dev/null and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.2 differ diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c index deabb002a..73d7ec3f2 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -488,6 +488,7 @@ void setupDetector() { AD9257_SetDefines(ADC_SPI_REG, ADC_SPI_SRL_CS_OTPT_MSK, ADC_SPI_SRL_CLK_OTPT_MSK, ADC_SPI_SRL_DT_OTPT_MSK, ADC_SPI_SRL_DT_OTPT_OFST); + AD9257_Set_Jungfrau_Hardware_Version_1_0(isHardwareVersion_1_0()); AD9257_Disable(); AD9257_Configure(); diff --git a/slsDetectorServers/slsDetectorServer/include/AD9257.h b/slsDetectorServers/slsDetectorServer/include/AD9257.h index 2989e7010..d0d282c92 100644 --- a/slsDetectorServers/slsDetectorServer/include/AD9257.h +++ b/slsDetectorServers/slsDetectorServer/include/AD9257.h @@ -4,6 +4,10 @@ #include +#ifdef JUNGFRAUD +void AD9257_Set_Jungfrau_Hardware_Version_1_0(int val); +#endif + /** * Set Defines * @param reg spi register diff --git a/slsDetectorServers/slsDetectorServer/src/AD9257.c b/slsDetectorServers/slsDetectorServer/src/AD9257.c index 7d49d4f0e..6ebf574f4 100644 --- a/slsDetectorServers/slsDetectorServer/src/AD9257.c +++ b/slsDetectorServers/slsDetectorServer/src/AD9257.c @@ -172,6 +172,14 @@ uint32_t AD9257_DigMask = 0x0; int AD9257_DigOffset = 0x0; int AD9257_VrefVoltage = 0; +#ifdef JUNGFRAUD +int AD9257_is_Jungfrau_Hardware_Version_1_0 = 0; + +void AD9257_Set_Jungfrau_Hardware_Version_1_0(int val) { + AD9257_is_Jungfrau_Hardware_Version_1_0 = val; +} +#endif + void AD9257_SetDefines(uint32_t reg, uint32_t cmsk, uint32_t clkmsk, uint32_t dmsk, int dofst) { AD9257_Reg = reg; @@ -286,8 +294,18 @@ void AD9257_Configure() { AD9257_OUT_BINARY_OFST_VAL | AD9257_OUT_LVDS_IEEE_VAL); // output clock phase +#ifdef JUNGFRAUD + if (AD9257_is_Jungfrau_Hardware_Version_1_0) { + LOG(logINFO, ("\tOutput clock phase: 120\n")); + AD9257_Set(AD9257_OUT_PHASE_REG, AD9257_OUT_CLK_120_VAL); + } else { + LOG(logINFO, ("\tOutput clock phase: 180\n")); + AD9257_Set(AD9257_OUT_PHASE_REG, AD9257_OUT_CLK_180_VAL); + } +#else LOG(logINFO, ("\tOutput clock phase: 180\n")); AD9257_Set(AD9257_OUT_PHASE_REG, AD9257_OUT_CLK_180_VAL); +#endif // all devices on chip to receive next command LOG(logINFO, ("\tAll devices on chip to receive next command\n")); diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index b84aebe0e..6738fe65d 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -6,8 +6,8 @@ #define APICTB "8.0.0 0x231109" #define APIGOTTHARD "8.0.0 0x231109" #define APIGOTTHARD2 "8.0.0 0x231109" -#define APIJUNGFRAU "8.0.0 0x231109" #define APIEIGER "8.0.0 0x231109" #define APILIB "8.0.1 0x240112" #define APIMOENCH "8.0.2 0x240703" #define APIMYTHEN3 "8.0.2 0x240715" +#define APIJUNGFRAU "8.0.2 0x240822"