detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 03:10:02 +02:00
Code Issues Actions Packages Releases Activity

Merge pull request #427 from slsdetectorgroup/m3mastertrigger

Browse Source 
m3:bug fix: slaves shoudl always have trigger
This commit is contained in:
Dhanya Thattil 2022-04-04 17:09:07 +02:00 committed by GitHub
commit 95ed9551c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -1603,7 +1603,7 @@ void setTiming(enum timingMode arg) {
int master = 0; int master = 0;
isMaster(&master); isMaster(&master);
if (master && arg == AUTO_TIMING) if (!master && arg == AUTO_TIMING)
arg = TRIGGER_EXPOSURE; arg = TRIGGER_EXPOSURE;
uint32_t addr = CONFIG_REG; uint32_t addr = CONFIG_REG;

2
slsSupportLib/include/sls/versionAPI.h
View File

@ -11,5 +11,5 @@
#define APIGOTTHARD 0x220328 #define APIGOTTHARD 0x220328
#define APIGOTTHARD2 0x220328 #define APIGOTTHARD2 0x220328
#define APIJUNGFRAU 0x220328 #define APIJUNGFRAU 0x220328
#define APIMYTHEN3 0x220328
#define APIMOENCH 0x220328 #define APIMOENCH 0x220328
#define APIMYTHEN3 0x220404