detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 04:47:14 +02:00
Code Issues Actions Packages Releases Activity

merge conflict from 3.0.1

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-17 11:35:02 +01:00
parent d9fcac0236 f647bdaa48
commit 51499fa503
11 changed files with 271 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/commonFiles/error_defs.h
View File

@ -242,7 +242,7 @@ public:
retval.append("Could not activate/deactivate receiver\n");
if(slsErrorMask&DATA_STREAMING)
retval.append("Could not set/reset Data Streaming\n");
retval.append("Could not enable/disable Data Streaming\n");
if(slsErrorMask&RESET_ERROR)
retval.append("Could not reset the FPGA\n");

1
slsDetectorSoftware/commonFiles/sls_detector_defs.h
View File

@ -194,6 +194,7 @@ enum networkParameter {
FLOW_CONTROL_WR_PTR, /**< memory write pointer for flow control */
FLOW_CONTROL_RD_PTR, /**< memory read pointer for flow control */
RECEIVER_STREAMING_PORT, /**< receiever streaming TCP(ZMQ) port */
CLIENT_STREAMING_PORT, /**< client streaming TCP(ZMQ) port */
RECEIVER_STREAMING_SRC_IP /**< receiever streaming TCP(ZMQ) ip */
};