mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-13 13:27:14 +02:00
merge conflict to include datastreaming in client comment
This commit is contained in:
@ -73,8 +73,10 @@ int main(int argc, char **argv) {
|
|||||||
pDetector->registerDataCallback(&dataCallback, NULL);
|
pDetector->registerDataCallback(&dataCallback, NULL);
|
||||||
/** - if receiver exists, enable data streaming from receiver to get the data */
|
/** - if receiver exists, enable data streaming from receiver to get the data */
|
||||||
pDetector->enableDataStreamingFromReceiver(1);
|
pDetector->enableDataStreamingFromReceiver(1);
|
||||||
|
/** - create zmq sockets in client to enable data streaming in of data from receiver/different process */
|
||||||
pDetector->enableDataStreamingToClient(1);
|
pDetector->enableDataStreamingToClient(1);
|
||||||
|
|
||||||
|
|
||||||
/** - ensuring detector status is idle before starting acquisition. exiting if not idle */
|
/** - ensuring detector status is idle before starting acquisition. exiting if not idle */
|
||||||
int status = pDetector->getDetectorStatus();
|
int status = pDetector->getDetectorStatus();
|
||||||
if (status != 0){
|
if (status != 0){
|
||||||
|
Reference in New Issue
Block a user