configure mac

This commit is contained in:
2020-08-04 16:55:31 +02:00
parent a70d4e1e5d
commit 380b062216
8 changed files with 81 additions and 5 deletions

View File

@ -776,6 +776,8 @@ class CmdProxy {
{"udp_dstmac2", &CmdProxy::udp_dstmac2},
{"udp_dstport", &CmdProxy::udp_dstport},
{"udp_dstport2", &CmdProxy::udp_dstport2},
{"udp_reconfigure", &CmdProxy::udp_reconfigure},
{"udp_validate", &CmdProxy::udp_validate},
{"rx_printconfig", &CmdProxy::rx_printconfig},
{"tengiga", &CmdProxy::tengiga},
{"flowcontrol10g", &CmdProxy::flowcontrol10g},
@ -1645,6 +1647,18 @@ class CmdProxy {
"sent to. \n[Eiger] Port number of the reciever (desintation) udp "
"interface where the right half of the detector data is sent to.");
EXECUTE_SET_COMMAND(
udp_reconfigure, reconfigureUDPDestination,
"\n\tReconfigures Detector with UDP destination. More for debugging as "
"the configuration is done automatically when the detector has "
"sufficient UDP details.");
EXECUTE_SET_COMMAND(
udp_validate, validateUDPConfiguration,
"\n\tValidates that UDP configuration in the detector is "
"valid. If not configured, it will throw with error message "
"requesting missing udp information.");
GET_COMMAND(rx_printconfig, printRxConfiguration,
"\n\tPrints the receiver configuration.");

View File

@ -716,6 +716,14 @@ void Detector::setDestinationUDPPort2(int port, int module_id) {
}
}
void Detector::reconfigureUDPDestination(Positions pos) {
pimpl->Parallel(&Module::reconfigureUDPDestination, pos);
}
void Detector::validateUDPConfiguration(Positions pos) {
pimpl->Parallel(&Module::validateUDPConfiguration, pos);
}
Result<std::string> Detector::printRxConfiguration(Positions pos) const {
return pimpl->Parallel(&Module::printReceiverConfiguration, pos);
}

View File

@ -638,6 +638,12 @@ void Module::setDestinationUDPPort2(const int port) {
}
}
void Module::reconfigureUDPDestination() { sendToDetector(F_RECONFIGURE_UDP); }
void Module::validateUDPConfiguration() {
sendToDetector(F_VALIDATE_UDP_CONFIG);
}
std::string Module::printReceiverConfiguration() {
std::ostringstream os;
os << "\n\nDetector " << moduleId << "\nReceiver Hostname:\t"

View File

@ -202,6 +202,8 @@ class Module : public virtual slsDetectorDefs {
void setDestinationUDPPort(int udpport);
int getDestinationUDPPort2() const;
void setDestinationUDPPort2(int udpport);
void reconfigureUDPDestination();
void validateUDPConfiguration();
std::string printReceiverConfiguration();
bool getTenGiga() const;
void setTenGiga(bool value);