mx/Jungfraujoch
2
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 54 Wiki Activity

AcquisitionDeviceGroup: Used to simplify handling multiple aq devices

Browse Source
This commit is contained in:
leonarski_f
2023-11-12 12:52:44 +01:00
parent a0c5223512
commit 3e4eb449de
22 changed files with 289 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
receiver/JFJochReceiverService.cpp
+6 -6
View File
@@ -60,9 +60,9 @@ void Convert(const RadialIntegrationProfiles& input, JFJochProtoBuf::RadialInteg
}
}
JFJochReceiverService::JFJochReceiverService(std::vector<AcquisitionDevice *> &open_capi_device,
JFJochReceiverService::JFJochReceiverService(AcquisitionDeviceGroup &in_aq_devices,
Logger &in_logger, ImagePusher &pusher) :
logger(in_logger), aq_devices(open_capi_device),
logger(in_logger), aq_devices(in_aq_devices),
image_pusher(pusher), data_processing_settings(DiffractionExperiment::DefaultDataProcessingSettings()) {
}
@@ -230,11 +230,11 @@ grpc::Status JFJochReceiverService::SetDataProcessingSettings(grpc::ServerContex
grpc::Status JFJochReceiverService::GetNetworkConfig(grpc::ServerContext *context, const JFJochProtoBuf::Empty *request,
JFJochProtoBuf::ReceiverNetworkConfig *response) {
for (const auto &aq: aq_devices) {
for (int i = 0; i < aq_devices.size(); i++) {
auto dev_net_cfg = response->add_device();
dev_net_cfg->set_mac_addr(aq->GetMACAddress());
dev_net_cfg->set_ipv4_addr(aq->GetIPv4Address());
dev_net_cfg->set_udp_port(aq->GetUDPPort());
dev_net_cfg->set_mac_addr(aq_devices[i].GetMACAddress());
dev_net_cfg->set_ipv4_addr(aq_devices[i].GetIPv4Address());
dev_net_cfg->set_udp_port(aq_devices[i].GetUDPPort());
}
return grpc::Status::OK;
}