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

WIP udp

Browse Source
This commit is contained in:
maliakal_d 2020-04-22 14:05:20 +02:00
parent 9ee2d389fb
commit c976c63fb5
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/src/Detector.cpp
View File

@ -633,6 +633,8 @@ Result<IpAddr> Detector::getDestinationUDPIP(Positions pos) const {
void Detector::setDestinationUDPIP(const IpAddr ip, Positions pos) {
pimpl->Parallel(&Module::setDestinationUDPIP, pos, ip);
auto mac = pimpl->Parallel1(&Receiver::setDestinationUDPIP, pos, {}, ip).squash();
setDestinationUDPMAC(mac, pos);
}
Result<IpAddr> Detector::getDestinationUDPIP2(Positions pos) const {

10
slsDetectorSoftware/src/Receiver.cpp
View File

@ -361,7 +361,15 @@ void Receiver::restreamStop() {
}
/** Network Configuration (Detector<->Receiver) */
sls::MacAddr Receiver::setDestinationUDPIP(const IpAddr ip) {
LOG(logDEBUG1) << "Setting destination udp ip to " << ip;
if (ip == 0) {
throw RuntimeError("Invalid destination udp ip address");
}
sls::MacAddr retval(0LU);
sendToReceiver(F_SET_RECEIVER_UDP_IP, ip, retval);
return retval;
}
/** Detector Parameters */
void Receiver::setNumberOfFrames(int64_t value) {

1
slsDetectorSoftware/src/Receiver.h
View File

@ -76,6 +76,7 @@ class Receiver : public virtual slsDetectorDefs {
* Network Configuration (Detector<->Receiver) *
* *
* ************************************************/
sls::MacAddr setDestinationUDPIP(const sls::IpAddr ip);
/**************************************************
* *