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

wip

Browse Source
This commit is contained in:
maliakal_d
2021-07-01 15:11:22 +02:00
parent 9d8c68b1d0 ece676ea76
commit cbdb05a3a8
30 changed files with 372 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -347,6 +347,9 @@ int getADC(enum ADCINDEX ind);
int setHighVoltage(int val);
// parameters - timing, extsig
#if defined(MYTHEN3D) || defined(EIGERD) || defined(GOTTHARDD)
int isMaster();
#endif
#ifdef GOTTHARD2D
void updatingRegisters();
#endif
@ -354,7 +357,6 @@ void setTiming(enum timingMode arg);
enum timingMode getTiming();
#ifdef MYTHEN3D
void setInitialExtSignals();
int isMaster();
int setGainCaps(int caps);
int getGainCaps();
int setChipStatusRegister(int csr);
@ -556,9 +558,12 @@ int startStateMachine();
void *start_timer(void *arg);
#endif
int stopStateMachine();
#if defined(EIGERD) || defined(MYTHEN3D)
#ifdef MYTHEN3D
int softwareTrigger();
#endif
#ifdef EIGERD
int softwareTrigger(int block);
#endif
#if defined(EIGERD) || defined(MYTHEN3D)
int startReadOut();
#endif

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

@ -4096,16 +4096,29 @@ int check_version(int file_des) {
int software_trigger(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
int arg = -1;
if (receiveData(file_des, &arg, sizeof(arg), INT32) < 0)
return printSocketReadError();
LOG(logDEBUG1, ("Software Trigger (block: %d\n", arg));
LOG(logDEBUG1, ("Software Trigger\n"));
#if !defined(EIGERD) && !defined(MYTHEN3D)
functionNotImplemented();
#else
if (arg && myDetectorType == MYTHEN3) {
ret = FAIL;
strcpy(mess, "Blocking trigger not implemented for Mythen3. Please use non blocking trigger.\n");
LOG(logERROR, (mess));
}
// only set
if (Server_VerifyLock() == OK) {
else if (Server_VerifyLock() == OK) {
#ifdef MYTHEN3
ret = softwareTrigger();
#else
ret = softwareTrigger(arg);
#endif
if (ret == FAIL) {
sprintf(mess, "Could not send software trigger\n");
strcpy(mess, "Could not send software trigger\n");
LOG(logERROR, (mess));
}
LOG(logDEBUG1, ("Software trigger successful\n"));
@ -8145,7 +8158,7 @@ int get_master(int file_des) {
LOG(logDEBUG1, ("Getting master\n"));
#ifndef MYTHEN3D
#if !defined(MYTHEN3D) && !defined(EIGERD) && !defined(GOTTHARDD)
functionNotImplemented();
#else
retval = isMaster();