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

merge conflict from 3.0.1 to restream stop from recieveR

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-30 19:05:47 +01:00
parent e17e4c3171 70bf6eb4cb
commit 6f3898441e
10 changed files with 102 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsReceiverSoftware/include/sls_receiver_funcs.h
View File

@ -62,6 +62,8 @@ enum recFuncs{
F_RECEIVER_STREAMING_SRC_IP, /** < sets the receiver streaming source IP */
F_SET_RECEIVER_SILENT_MODE, /** < sets the receiver silent mode */
F_ENABLE_GAPPIXELS_IN_RECEIVER, /** < sets gap pixels in the receiver */
F_RESTREAM_STOP_FROM_RECEIVER, /** < restream stop from receiver */
/* Always append functions hereafter!!! */