From d5ae9a22f4d00b981bc4ea2859e3c9dd95b6ac37 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 16 Jun 2020 15:00:02 +0200 Subject: [PATCH] mythen3: changed system vco from 1.25GHz to 1GHz and hence the sytem clock dividers defaults --- .../bin/mythen3DetectorServer_developer | Bin 172864 -> 172864 bytes .../slsDetectorServer_defs.h | 8 ++++---- slsSupportLib/include/versionAPI.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index 65f996a9411c57103539eaaa5b9d51cd7fa515d6..59b3440a748f60f554541cad7e47d872ad897a1e 100755 GIT binary patch delta 87 zcmX?bjO)NLt_>wJOf9XG*U6|)o-4x-WNuz3^NdxIh4BD`DANIfEes6|EUhyISeSr( hW+eXPtxEpvU!L_burzFH=2mX!R%YDJt;}TF002XG9BKdn delta 87 zcmX?bjO)NLt_>wJOe`&v*U6|)o-4x-WNuz3^Ndx|h4BD`DANIfEes6|EUhyIT9|-* hW+eXPtxEpvB?~4ouqe!L=2mX!R%YDJt;}TF000(N8*=~v diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h index 632cc66b1..11d81a494 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h @@ -37,9 +37,9 @@ #define DEFAULT_TIMING_MODE (AUTO_TIMING) #define DEFAULT_READOUT_C0 (10) //(125000000) // rdo_clk, 125 MHz #define DEFAULT_READOUT_C1 (10) //(125000000) // rdo_x2_clk, 125 MHz -#define DEFAULT_SYSTEM_C0 (5) //(250000000) // run_clk, 250 MHz -#define DEFAULT_SYSTEM_C1 (10) //(125000000) // chip_clk, 125 MHz -#define DEFAULT_SYSTEM_C2 (10) //(125000000) // sync_clk, 125 MHz +#define DEFAULT_SYSTEM_C0 (4) //(250000000) // run_clk, 250 MHz +#define DEFAULT_SYSTEM_C1 (8) //(125000000) // chip_clk, 125 MHz +#define DEFAULT_SYSTEM_C2 (8) //(125000000) // sync_clk, 125 MHz #define DEFAULT_ASIC_LATCHING_NUM_PULSES (10) #define DEFAULT_MSTR_OTPT_P1_NUM_PULSES (20) @@ -47,7 +47,7 @@ #define IP_HEADER_SIZE (20) #define FIXED_PLL_FREQUENCY (020000000) // 20MHz #define READOUT_PLL_VCO_FREQ_HZ (1250000000) // 1.25GHz -#define SYSTEM_PLL_VCO_FREQ_HZ (1250000000) // 1.25GHz +#define SYSTEM_PLL_VCO_FREQ_HZ (1000000000) // 1GHz #define MAX_PATTERN_LENGTH (0x2000) // maximum number of words (64bit) /** Other Definitions */ diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 47dac799a..70c424440 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -6,7 +6,7 @@ #define APICTB 0x200610 #define APIGOTTHARD 0x200610 #define APIJUNGFRAU 0x200610 -#define APIMYTHEN3 0x200610 #define APIMOENCH 0x200610 #define APIGOTTHARD2 0x200610 #define APIEIGER 0x200615 +#define APIMYTHEN3 0x200616