detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-22 02:02:22 +01:00
Code Issues Actions Packages Releases Activity

merge conflict

Browse Source
This commit is contained in:
maliakal_d
2019-03-14 12:41:37 +01:00
parent 327d08a016 1960460e43
commit cb687d805e
5 changed files with 2911 additions and 1029 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@@ -1672,14 +1672,14 @@ class slsDetector : public virtual slsDetectorDefs, public virtual errorDefs {
* @param myMod module structure to send
* @returns number of bytes sent to the detector
*/
int sendModule(sls_detector_module *myMod);
int sendModule(sls_detector_module *myMod, sls::ClientSocket& client);
/**
* Receive a sls_detector_module structure over socket
* @param myMod module structure to receive
* @returns number of bytes received from the detector
*/
int receiveModule(sls_detector_module *myMod);
int receiveModule(sls_detector_module *myMod, sls::ClientSocket& client);
/**
* Get MAC from the receiver using udpip and