From ad2004be8f5991b96de2d0f5010d3442cbea6bf9 Mon Sep 17 00:00:00 2001
From: Felix Exner <feex@universal-robots.com>
Date: Fri, 10 Jan 2025 15:34:47 +0100
Subject: [PATCH] WIP: Make version stuff in dashboard client public
---
include/ur_client_library/ur/dashboard_client.h | 11 ++++++-----
tests/test_dashboard_client.cpp | 1 -
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/ur_client_library/ur/dashboard_client.h b/include/ur_client_library/ur/dashboard_client.h
index 7dabf2cf8..b48dd227a 100644
--- a/include/ur_client_library/ur/dashboard_client.h
+++ b/include/ur_client_library/ur/dashboard_client.h
@@ -434,7 +434,6 @@ class DashboardClient : public comm::TCPSocket
*/
bool commandSaveLog();
-private:
/*!
* \brief Makes sure that the dashboard_server's version is above the required version
*
@@ -446,9 +445,7 @@ class DashboardClient : public comm::TCPSocket
*/
void assertVersion(const std::string& e_series_min_ver, const std::string& cb3_min_ver,
const std::string& required_call);
- bool send(const std::string& text);
- std::string read();
- void rtrim(std::string& str, const std::string& chars = "\t\n\v\f\r ");
+ VersionInformation polyscope_version_;
/*!
* \brief Gets the configured receive timeout. If receive timeout is unconfigured "normal" socket timeout of 1 second
@@ -458,7 +455,11 @@ class DashboardClient : public comm::TCPSocket
*/
timeval getConfiguredReceiveTimeout() const;
- VersionInformation polyscope_version_;
+private:
+ bool send(const std::string& text);
+ std::string read();
+ void rtrim(std::string& str, const std::string& chars = "\t\n\v\f\r ");
+
std::string host_;
int port_;
std::mutex write_mutex_;
diff --git a/tests/test_dashboard_client.cpp b/tests/test_dashboard_client.cpp
index 1ef235c8c..b253e2ead 100644
--- a/tests/test_dashboard_client.cpp
+++ b/tests/test_dashboard_client.cpp
@@ -34,7 +34,6 @@
#include <thread>
#include "ur_client_library/comm/tcp_socket.h"
#include "ur_client_library/ur/version_information.h"
-#define private public
#include <ur_client_library/ur/dashboard_client.h>
using namespace urcl;