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

modified user example in manual/manual-api and regenerated documentation

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-08-24 16:47:27 +02:00
parent 598d163173
commit 319d883880
123 changed files with 166 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manual/manual-api/Makefile
View File

@ -1,13 +1,14 @@
INCLUDES = -I .
SRC_DET = mainClient.cpp
SRC_REC = mainReceiver.cpp
LIBDIR = ../../bin
LDFLAG_DET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread
LDFLAG_REC = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread
LIBDIR = ../../build/bin
LDFLAG_DET = -I. -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread -lrt -L. -lzmq
LDFLAG_REC = -I. -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread -lrt -L. -lzmq
DESTDIR ?= ../docs
all: docs detUser detReceiver
echo "in useeeeeeeeeers ****************************************************************************************************"
#all: docs
docs: createdocs docspdf docshtml removedocs

BIN
manual/manual-api/detReceiver
View File

Binary file not shown.

BIN
manual/manual-api/detUser
View File

Binary file not shown.

1
manual/manual-api/libzmq.a Symbolic link
View File

@ -0,0 +1 @@
../../slsReceiverSoftware/include/libzmq.a

4
manual/manual-api/mainClient.cpp
View File

@ -42,8 +42,8 @@ int main(int argc, char **argv) {
cout<<"Detector configured" << endl;
}
/** registering data callback */
//pDetector->registerDataCallback(&dataCallback, NULL);
//pDetector->enableDataStreamingFromReceiver(1);
pDetector->registerDataCallback(&dataCallback, NULL);
pDetector->enableDataStreamingFromReceiver(1);
/** checking detector status and exiting if not idle */
int status = pDetector->getDetectorStatus();

2
manual/manual-api/mainReceiver.cpp
View File

@ -18,7 +18,7 @@
#include <string>
using namespace std;
#define NUM_RECEIVERS 2
#define NUM_RECEIVERS 1
#define START_TCP_PORT 1954
#define PRINT_IN_COLOR(c,f, ...) printf ("\033[%dm" f RESET, 30 + c+1, ##__VA_ARGS__)

1
manual/manual-api/zmq.h Symbolic link
View File

@ -0,0 +1 @@
../../slsReceiverSoftware/include/zmq.h