From fe895cd7820df3884dffbf61d0bdd7d48120c28f Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 4 Apr 2022 17:06:38 +0200 Subject: [PATCH 1/2] m3:bug fix: slaves shoudl always have trigger --- .../mythen3DetectorServer/slsDetectorFunctionList.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c index 75b51de7b..58efca312 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c @@ -1603,7 +1603,7 @@ void setTiming(enum timingMode arg) { int master = 0; isMaster(&master); - if (master && arg == AUTO_TIMING) + if (!master && arg == AUTO_TIMING) arg = TRIGGER_EXPOSURE; uint32_t addr = CONFIG_REG; From 0f2ec47b5f017ed488ae1d7dbf7be030bfe7f1d1 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 4 Apr 2022 17:08:38 +0200 Subject: [PATCH 2/2] binaries in --- .../bin/mythen3DetectorServer_developer | Bin 274076 -> 274076 bytes slsSupportLib/include/sls/versionAPI.h | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index dadb7a6481459d676ae030d95c79421cd973e29a..ea3ba327b820cb13a2f153f49dc945363289d8d3 100755 GIT binary patch delta 55 zcmbPpS76RvfepH#LeUD7DSKs{LM!YMW&Xrsx8Nnm5mF-#nKQh?%x;p3D4l F0swO07mxq| diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 71b44521d..c96fd733d 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -11,5 +11,5 @@ #define APIGOTTHARD 0x220328 #define APIGOTTHARD2 0x220328 #define APIJUNGFRAU 0x220328 -#define APIMYTHEN3 0x220328 #define APIMOENCH 0x220328 +#define APIMYTHEN3 0x220404