detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +02:00
Code Issues Actions Packages Releases Activity

M3: software trigger (#175)

Browse Source
This commit is contained in:
Dhanya Thattil
2020-09-10 10:15:45 +02:00
committed by GitHub
parent d011186b9a
commit 3cd4f3897b
11 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
View File

@ -557,7 +557,7 @@ int startStateMachine();
void *start_timer(void *arg);
#endif
int stopStateMachine();
#ifdef EIGERD
#if defined(EIGERD) || defined(MYTHEN3D)
int softwareTrigger();
#endif

2
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -4107,7 +4107,7 @@ int software_trigger(int file_des) {
memset(mess, 0, sizeof(mess));
LOG(logDEBUG1, ("Software Trigger\n"));
#ifndef EIGERD
#if !defined(EIGERD) && !defined(MYTHEN3D)
functionNotImplemented();
#else
// only set