From a9d1a786624ded9dd9c65ccc56a6a831ee06532c Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 9 Sep 2020 15:55:13 +0200 Subject: [PATCH] m3:smp_clk (timing rxr) changed back to clk div 5 --- .../bin/mythen3DetectorServer_developer | Bin 215756 -> 215756 bytes .../slsDetectorServer_defs.h | 4 ++-- slsSupportLib/include/versionAPI.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index e57b7891aae857dd0f4bb4505cd5d0bf32f329a4..b98c02bda5dc8b3658dbd5f7ac21cb56f58d4fa4 100755 GIT binary patch delta 58 zcmX>zmG{h4-VGC!7+oe$R5AyX8q<5PFmg{WP!`=RsC=K5$%S$ACyh<%j4sVfC$uk} Mz_@+s1Sa)e0Etx=bN~PV delta 58 zcmX>zmG{h4-VGC!7+EGyR5AyX8q<5PFmg{WP!`=RsC=K5sfB6tCyh<%j4aJdC$uk} Mz_@+s1Sa)e0CegV^#A|> diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h index 9b0f5009b..fdd247327 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h @@ -42,8 +42,8 @@ #define DEFAULT_SYSTEM_C0 (20) // (50000000) // run_clk, 50 MHz #define DEFAULT_SYSTEM_C1 (10) //(100000000) // sync_clk, 100 MHz #define DEFAULT_SYSTEM_C2 (10) //(100000000) // str_clk, 100 MHz -#define DEFAULT_SYSTEM_C3 (10) //(100000000) // smp_clk, 100 MHz -// (DEFAULT_SYSTEM_C3 only for timing receiver) +#define DEFAULT_SYSTEM_C3 (5) //(200000000) // smp_clk, 200 MHz +// (DEFAULT_SYSTEM_C3 only for timing receiver) should not be changed #define DEFAULT_ASIC_LATCHING_NUM_PULSES (10) #define DEFAULT_MSTR_OTPT_P1_NUM_PULSES (20) diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 34164b87b..c6b1b668a 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -9,4 +9,4 @@ #define APIGOTTHARD2 0x200908 #define APIJUNGFRAU 0x200908 #define APIMOENCH 0x200908 -#define APIMYTHEN3 0x200908 +#define APIMYTHEN3 0x200909