From a2e019ff36295febca2294522b61c35cc3e843e9 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 6 Mar 2020 10:47:21 +0100 Subject: [PATCH] moench: updated adcpipeline from 14 to 15 --- .../bin/moenchDetectorServer_developer | Bin 186540 -> 186540 bytes .../slsDetectorServer_defs.h | 2 +- slsSupportLib/include/versionAPI.h | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index 992f7c42363d7a25510d9ffc797f2c945bb03729..b24630a505f55ae85f6abe828b4658f88242a054 100755 GIT binary patch delta 70 zcmZ3pk$cTX?g^UANirhS8$FpMHo8pU6lG&x;l-H1_=15!fB^`Aw8BHS%`Z7a*%&J~ Y+Y1~uW@Kw-b!lgHVcgE@!nAw}0M+&r)&Kwi delta 70 zcmZ3pk$cTX?g^UAi3SI!H+nKjY;>8xDay*c!izD1@dX2e00R&JX@!TZn_qHe9~Y!nmE)g=zT|00C7LivR!s diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h index 7615d56af..4e307cda6 100755 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h @@ -84,7 +84,7 @@ enum CLKINDEX {RUN_CLK, ADC_CLK, SYNC_CLK, DBIT_CLK, NUM_CLOCKS}; #define DEFAULT_DBIT_CLK (40) #define DEFAULT_ADC_PHASE_DEG (30) -#define DEFAULT_PIPELINE (14) +#define DEFAULT_PIPELINE (15) #define DEFAULT_SETTINGS (G4_HIGHGAIN) // settings diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 023f6db4a..04aafabad 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -9,4 +9,4 @@ #define APIMYTHEN3 0x200305 #define APIEIGER 0x200305 #define APIGOTTHARD2 0x200305 -#define APIMOENCH 0x200305 +#define APIMOENCH 0x200306