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

conflict resolved from merge developer to gappixels insignificant

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-11-10 16:54:18 +01:00
commit 678ef89e17
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -6517,6 +6517,7 @@ int slsDetector::configureMAC(){
} }
} }
//if udpip wasnt initialized in config file //if udpip wasnt initialized in config file
if(!(strcmp(thisDetector->receiverUDPIP,"none"))){ if(!(strcmp(thisDetector->receiverUDPIP,"none"))){
//hostname is an ip address //hostname is an ip address