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

added enum left right top bottom

Browse Source
This commit is contained in:
maliakal_d
2021-07-21 09:25:27 +02:00
parent ec7ba7c508
commit 8ba37e99a7
9 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -2051,15 +2051,11 @@ int getActivate(int *retval) {
return OK;
}
int setDataStream(enum portPositiion port, int enable) {
int setDataStream(enum portPosition port, int enable) {
if (enable < 0) {
LOG(logERROR, ("Invalid setDataStream enable argument: %d\n", enable));
return FAIL;
}
if (left < 0) {
LOG(logERROR, ("Invalid setDataStream port argument: %d\n", port));
return FAIL;
}
#ifdef VIRTUAL
if (port == LEFT) {
eiger_virtual_left_datastream = enable;
@ -2074,7 +2070,7 @@ int setDataStream(enum portPositiion port, int enable) {
return OK;
}
int getDataStream(enum portPositiion port, int *retval) {
int getDataStream(enum portPosition port, int *retval) {
#ifdef VIRTUAL
if (port == LEFT) {
*retval = eiger_virtual_left_datastream;

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

@ -474,8 +474,8 @@ int getAllTrimbits();
int getBebFPGATemp();
int setActivate(int enable);
int getActivate(int *retval);
int getDataStream(enum portPositiion port, int *retval);
int setDataStream(enum portPositiion port, int enable);
int getDataStream(enum portPosition port, int *retval);
int setDataStream(enum portPosition port, int enable);
// gotthard specific - adc phase
#elif GOTTHARDD

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

@ -8298,7 +8298,7 @@ int set_datastream(int file_des) {
#else
// only set
if (Server_VerifyLock() == OK) {
enum portPosition port = static_cast<portPosition>(args[0]);
enum portPosition port = args[0];
int enable = args[1];
char msg[256];
memset(msg, 0, sizeof(msg));