Some remaining details to Merge branch 'main' into fix/allow-param-de…

…faults
PepperlFuchs · Jan 17, 2025 · f487320 · f487320
1 parent ae2c63c
commit f487320
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/pf_driver/src/pf/pfsdp_base.cpp b/src/pf_driver/src/pf/pfsdp_base.cpp
@@ -259,7 +259,7 @@ void PFSDPBase::request_handle_tcp(int port)
   param_vector_type query;
   if (!config_->packet_type.empty())
   {
-    query.push_back(KV("packet_type", packet_type));
+    query.push_back(KV("packet_type", config_->packet_type));
   }
   if (port != 0)
   {
@@ -271,7 +271,7 @@ void PFSDPBase::request_handle_tcp(int port)
   info_->actual_port = parser_utils::to_long(resp["port"]);
 }
 
-void PFSDPBase::request_handle_udp(const std::string& packet_type)
+void PFSDPBase::request_handle_udp()
 {
   param_vector_type query = { KV("address", info_->endpoint), KV("port", info_->actual_port) };
   if (!config_->packet_type.empty())

diff --git a/src/pf_driver/src/ros/ros_main.cpp b/src/pf_driver/src/ros/ros_main.cpp
@@ -16,6 +16,7 @@ int main(int argc, char* argv[])
   std::string device;
   std::string transport_str;
   std::string scanner_ip;
+  int port = 0; /* 0 means: automatic */
   std::string topic("/scan");
   std::string frame_id("scanner_link");
   std::string packet_type; /* empty means: use scanner default */