From 553bbf4c351d3c0c339d9071bf4a4f7945b43c40 Mon Sep 17 00:00:00 2001 From: Alice Date: Wed, 25 Feb 2026 14:06:50 +0100 Subject: [PATCH] WIP --- .../matterhonServer/include/MatterhornServer.h | 15 ++++++++++++++- .../matterhonServer/src/MatterhornServer.cpp | 10 ++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/slsDetectorServers/matterhonServer/include/MatterhornServer.h b/slsDetectorServers/matterhonServer/include/MatterhornServer.h index 6cbeef0a9..1f5b1a004 100644 --- a/slsDetectorServers/matterhonServer/include/MatterhornServer.h +++ b/slsDetectorServers/matterhonServer/include/MatterhornServer.h @@ -38,11 +38,18 @@ class MatterhornServer { ReturnCode get_num_udp_interfaces(ServerInterface &socket); + ReturnCode get_update_mode(ServerInterface &socket); + + ReturnCode get_source_udp_mac(ServerInterface &socket); + private: static std::string getMatterhornServerVersion(); size_t num_udp_interfaces() const; + /// @brief TODO what is this? + bool updateMode{true}; + private: /// @brief @brief TCP/IP interface for communication with the client std::unique_ptr tcpInterface; @@ -62,8 +69,14 @@ class MatterhornServer { }}, {detFuncs::F_INITIAL_CHECKS, [this](ServerInterface &si) { return this->initial_checks(si); }}, - {detFuncs::F_GET_NUM_INTERFACES, [this](ServerInterface &si) { + {detFuncs::F_GET_NUM_INTERFACES, + [this](ServerInterface &si) { return this->get_num_udp_interfaces(si); + }}, + {detFuncs::F_GET_UPDATE_MODE, + [this](ServerInterface &si) { return this->get_update_mode(si); }}, + {detFuncs::F_GET_SOURCE_UDP_MAC, [this](ServerInterface &si) { + return this->get_source_udp_mac(si); }}}; }; diff --git a/slsDetectorServers/matterhonServer/src/MatterhornServer.cpp b/slsDetectorServers/matterhonServer/src/MatterhornServer.cpp index f4f049574..e26eb3ffb 100644 --- a/slsDetectorServers/matterhonServer/src/MatterhornServer.cpp +++ b/slsDetectorServers/matterhonServer/src/MatterhornServer.cpp @@ -66,4 +66,14 @@ ReturnCode MatterhornServer::get_num_udp_interfaces(ServerInterface &socket) { return static_cast(socket.sendResult(numUDPInterfaces)); } +ReturnCode MatterhornServer::get_update_mode(ServerInterface &socket) { + return static_cast( + socket.sendResult(static_cast(updateMode))); +} + +ReturnCode MatterhornServer::get_source_udp_mac(ServerInterface &socket) { + uint64_t srcMac = udpDetails[0].srcmac; + return static_cast(socket.sendResult(srcMac)); +} + } // namespace sls \ No newline at end of file