mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-01-16 10:04:39 +01:00
guiDataReady introduced so that both tcp and writing thread handshakes properly with their own variables
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@486 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
@@ -33,11 +33,12 @@ const enum detectorType myDetectorType=GENERIC;
|
||||
|
||||
|
||||
//define in communication_funcs
|
||||
/*
|
||||
extern int lockStatus;
|
||||
extern char lastClientIP[INET_ADDRSTRLEN];
|
||||
extern char thisClientIP[INET_ADDRSTRLEN];
|
||||
extern int differentClients;
|
||||
|
||||
*/
|
||||
|
||||
|
||||
/* global variables for optimized readout */
|
||||
|
||||
@@ -536,7 +536,7 @@ enum angleConversionParameter {
|
||||
//} angleConversionConstant;
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
#ifdef MYROOT
|
||||
protected:
|
||||
#endif
|
||||
|
||||
@@ -546,7 +546,7 @@ enum angleConversionParameter {
|
||||
#include "sls_detector_funcs.h"
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
#ifdef MYROOT
|
||||
};
|
||||
#endif
|
||||
;
|
||||
|
||||
Reference in New Issue
Block a user