detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-28 17:10:03 +02:00
Code Issues Actions Packages Releases Activity

replace error

Browse Source
This commit is contained in:
maliakal_d 2021-07-20 15:05:43 +02:00
parent efe26b2b0d
commit d40d9d122b
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsReceiverSoftware/src/ClientInterface.cpp
View File

@ -1412,9 +1412,9 @@ sls::MacAddr ClientInterface::setUdpIp(sls::IpAddr arg) {
LOG(logERROR) << "Failed to get udp ethernet interface from IP " << arg LOG(logERROR) << "Failed to get udp ethernet interface from IP " << arg
<< ". Got " << eth; << ". Got " << eth;
} }
impl()->setethernetInterface(eth); impl()->setEthernetInterface(eth);
if (myDetectorType == EIGER) { if (myDetectorType == EIGER) {
impl()->setethernetInterface2(eth); impl()->setEthernetInterface2(eth);
} }
// get mac address // get mac address
auto retval = sls::InterfaceNameToMac(eth); auto retval = sls::InterfaceNameToMac(eth);
@ -1446,7 +1446,7 @@ sls::MacAddr ClientInterface::setUdpIp2(sls::IpAddr arg) {
LOG(logERROR) << "Failed to get udp ethernet interface2 from IP " << arg LOG(logERROR) << "Failed to get udp ethernet interface2 from IP " << arg
<< ". Got " << eth; << ". Got " << eth;
} }
impl()->setethernetInterface2(eth); impl()->setEthernetInterface2(eth);
// get mac address // get mac address
auto retval = sls::InterfaceNameToMac(eth); auto retval = sls::InterfaceNameToMac(eth);

8
slsReceiverSoftware/src/Implementation.cpp
View File

@ -939,16 +939,16 @@ void Implementation::setNumberofUDPInterfaces(const int n) {
LOG(logINFO) << "Number of Interfaces: " << numUDPInterfaces; LOG(logINFO) << "Number of Interfaces: " << numUDPInterfaces;
} }
std::string Implementation::getethernetInterface() const { return eth[0]; } std::string Implementation::getEthernetInterface() const { return eth[0]; }
void Implementation::setethernetInterface(const std::string &c) { void Implementation::setEthernetInterface(const std::string &c) {
eth[0] = c; eth[0] = c;
LOG(logINFO) << "Ethernet Interface: " << eth[0]; LOG(logINFO) << "Ethernet Interface: " << eth[0];
} }
std::string Implementation::getethernetInterface2() const { return eth[1]; } std::string Implementation::getEthernetInterface2() const { return eth[1]; }
void Implementation::setethernetInterface2(const std::string &c) { void Implementation::setEthernetInterface2(const std::string &c) {
eth[1] = c; eth[1] = c;
LOG(logINFO) << "Ethernet Interface 2: " << eth[1]; LOG(logINFO) << "Ethernet Interface 2: " << eth[1];
} }

8
slsReceiverSoftware/src/Implementation.h
View File

@ -98,11 +98,11 @@ class Implementation : private virtual slsDetectorDefs {
int getNumberofUDPInterfaces() const; int getNumberofUDPInterfaces() const;
/* [Jungfrau] */ /* [Jungfrau] */
void setNumberofUDPInterfaces(const int n); void setNumberofUDPInterfaces(const int n);
std::string getethernetInterface() const; std::string getEthernetInterface() const;
void setethernetInterface(const std::string &c); void setEthernetInterface(const std::string &c);
std::string getethernetInterface2() const; std::string getEthernetInterface2() const;
/* [Jungfrau] */ /* [Jungfrau] */
void setethernetInterface2(const std::string &c); void setEthernetInterface2(const std::string &c);
uint32_t getUDPPortNumber() const; uint32_t getUDPPortNumber() const;
void setUDPPortNumber(const uint32_t i); void setUDPPortNumber(const uint32_t i);
uint32_t getUDPPortNumber2() const; uint32_t getUDPPortNumber2() const;