detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-07 18:40:42 +02:00
Code Issues Actions Packages Releases Activity

posisibility to overwrite rx_udpmac even with receiver

Browse Source
This commit is contained in:
maliakal_d 2018-02-26 18:22:07 +01:00
parent 74f327a959
commit 5849725b97
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RELEASE.txt
View File

@ -209,6 +209,10 @@ Resolved Issues
3. More locking to handle main and processing threads using the threadpool. 3. More locking to handle main and processing threads using the threadpool.
Removing unlock twice, which is undefined behavior. Removing unlock twice, which is undefined behavior.
4. Setting rx_udpmac should overwrite the receiver defined mac address.
Should be after rx_hostname command and followed by
"sls_detector_put configuremac 0"
Detector Server Detector Server
--------------- ---------------

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -6349,9 +6349,9 @@ string slsDetector::setReceiverUDPMAC(string udpmac){
#else #else
; ;
#endif #endif
else if(setUDPConnection()==FAIL){ /* else if(setUDPConnection()==FAIL){ commented out to be replaced by user defined udpmac
std::cout<< "Warning: UDP connection set up failed" << std::endl; std::cout<< "Warning: UDP connection set up failed" << std::endl;
} }*/
}else{ }else{
setErrorMask((getErrorMask())|(COULDNOT_SET_NETWORK_PARAMETER)); setErrorMask((getErrorMask())|(COULDNOT_SET_NETWORK_PARAMETER));
std::cout << "Warning: receiver udp mac address should be in xx:xx:xx:xx:xx:xx format" << std::endl; std::cout << "Warning: receiver udp mac address should be in xx:xx:xx:xx:xx:xx format" << std::endl;