Skip to content

Commit 7d8a136

Browse files
JayHerpinlreiher
andauthored
Apply suggestions from code review
Co-authored-by: Lennart Reiher <lreiher@me.com>
1 parent 41cba10 commit 7d8a136

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

mqtt_client/include/mqtt_client/MqttClient.ros2.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ class MqttClient : public rclcpp::Node,
7373
explicit MqttClient(const rclcpp::NodeOptions& options);
7474

7575
protected:
76-
class Ros2MqttInterface;
77-
class Mqtt2RosInterface;
76+
struct Ros2MqttInterface;
77+
struct Mqtt2RosInterface;
7878

7979
/**
8080
* @brief Loads ROS parameters from parameter server.

mqtt_client/src/MqttClient.ros2.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -418,12 +418,10 @@ void MqttClient::loadParameters() {
418418
// ros2mqtt[k]/ros_type
419419
rclcpp::Parameter ros_type_param;
420420
if (get_parameter(fmt::format("bridge.ros2mqtt.{}.ros_type", ros_topic), ros_type_param)) {
421-
422-
423421
ros2mqtt.ros.msg_type = ros_type_param.as_string();
424422
ros2mqtt.fixed_type = true;
425423
ros2mqtt.primitive = true;
426-
RCLCPP_DEBUG(get_logger(), "Using explicit ros type %s", ros2mqtt.ros.msg_type.c_str ());
424+
RCLCPP_DEBUG(get_logger(), "Using explicit ROS message type '%s'", ros2mqtt.ros.msg_type.c_str());
427425
}
428426

429427
// ros2mqtt[k]/inject_timestamp
@@ -511,8 +509,6 @@ void MqttClient::loadParameters() {
511509
Mqtt2RosInterface& mqtt2ros = mqtt2ros_[mqtt_topic];
512510
mqtt2ros.ros.topic = ros_topic;
513511

514-
RCLCPP_DEBUG(get_logger(), "MQTT %s to ROS %s", mqtt_topic.c_str(), ros_topic.c_str ());
515-
516512
// mqtt2ros[k]/primitive
517513
rclcpp::Parameter primitive_param;
518514
if (get_parameter(fmt::format("bridge.mqtt2ros.{}.primitive", mqtt_topic), primitive_param))
@@ -524,8 +520,7 @@ void MqttClient::loadParameters() {
524520
mqtt2ros.ros.msg_type = ros_type_param.as_string();
525521
mqtt2ros.fixed_type = true;
526522
mqtt2ros.primitive = true;
527-
528-
RCLCPP_DEBUG(get_logger(), "Using explicit ros type %s for %s", mqtt2ros.ros.msg_type.c_str (), ros_topic.c_str ());
523+
RCLCPP_DEBUG(get_logger(), "Using explicit ROS message type '%s' for '%s'", mqtt2ros.ros.msg_type.c_str(), ros_topic.c_str());
529524
}
530525

531526
// mqtt2ros[k]/advanced/mqtt/qos

0 commit comments

Comments
 (0)