mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-18 15:57:13 +02:00
Stoppedflag (#44)
* removed stopped flag from multi and sls shm, since its removed from fixed pattern in sls, slsshmversion api also added to get hostname and type * clang format
This commit is contained in:

committed by
Erik Fröjdh

parent
b524e0c95f
commit
64a8dd2def
@ -12,6 +12,7 @@
|
||||
|
||||
class ServerInterface;
|
||||
|
||||
#define SLS_SHMAPIVERSION 0x190726
|
||||
#define SLS_SHMVERSION 0x190726
|
||||
|
||||
/**
|
||||
@ -24,13 +25,6 @@ struct sharedSlsDetector {
|
||||
/** shared memory version */
|
||||
int shmversion;
|
||||
|
||||
/** is the port used for control functions */
|
||||
int controlPort;
|
||||
|
||||
/** stopped flag - is set if an acquisition error occurs or the detector
|
||||
* is stopped manually. Is reset to 0 at the start of the acquisition */
|
||||
int stoppedFlag;
|
||||
|
||||
/** is the hostname (or IP address) of the detector. needs to be set
|
||||
* before starting the communication */
|
||||
char hostname[MAX_STR_LENGTH];
|
||||
@ -47,6 +41,9 @@ struct sharedSlsDetector {
|
||||
/** Number of detectors in multi list in x dir and y dir */
|
||||
int multiSize[2];
|
||||
|
||||
/** is the port used for control functions */
|
||||
int controlPort;
|
||||
|
||||
/** is the port used to stop the acquisition */
|
||||
int stopPort;
|
||||
|
||||
@ -259,6 +256,11 @@ class slsDetector : public virtual slsDetectorDefs{
|
||||
*/
|
||||
virtual ~slsDetector();
|
||||
|
||||
/**
|
||||
* Returns false if it cannot get fixed pattern from an old version of shm (hostname, type), else true
|
||||
*/
|
||||
bool isFixedPatternSharedMemoryCompatible();
|
||||
|
||||
/**
|
||||
* Check version compatibility with receiver software
|
||||
*/
|
||||
|
Reference in New Issue
Block a user