From 4db0d1a19ed0b31c47186138541e8e2c6ea76a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pe=C5=82ka?= Date: Thu, 22 Aug 2024 11:23:32 +0200 Subject: [PATCH] Applied review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Pełka --- .../Clients/ExposeConsoleToRosSystemComponent.cpp | 15 +++++++++++---- .../Clients/ExposeConsoleToRosSystemComponent.h | 4 ++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Gems/ExposeConsoleToRos/Code/Source/Clients/ExposeConsoleToRosSystemComponent.cpp b/Gems/ExposeConsoleToRos/Code/Source/Clients/ExposeConsoleToRosSystemComponent.cpp index 976d8d0..01b9c74 100644 --- a/Gems/ExposeConsoleToRos/Code/Source/Clients/ExposeConsoleToRosSystemComponent.cpp +++ b/Gems/ExposeConsoleToRos/Code/Source/Clients/ExposeConsoleToRosSystemComponent.cpp @@ -7,6 +7,7 @@ namespace ExposeConsoleToRos { + AZ_COMPONENT_IMPL(ExposeConsoleToRosSystemComponent, "ExposeConsoleToRosSystemComponent", ExposeConsoleToRosSystemComponentTypeId); void ExposeConsoleToRosSystemComponent::Reflect(AZ::ReflectContext* context) @@ -34,20 +35,26 @@ namespace ExposeConsoleToRos void ExposeConsoleToRosSystemComponent::Activate() { +#if defined(AZ_DEBUG_BUILD) || defined(AZ_PROFILE_BUILD) auto ros2Node = ROS2::ROS2Interface::Get()->GetNode(); AZ_Assert(ros2Node, "ROS2 node is not available"); m_consolePublisher = ros2Node->create_publisher("o3de_console_out", 10); - m_consoleSubscription = ros2Node->create_subscription("o3de_console_in", 10, - [](const std_msgs::msg::String::SharedPtr msg) { - AZ_Printf("ExposeConsoleToRos", "Received message: %s", msg->data.c_str()); + m_consoleSubscription = ros2Node->create_subscription( + "o3de_console_in", + 10, + [](const std_msgs::msg::String::SharedPtr msg) + { + AZ_Info("ExposeConsoleToRos", "Received message: %s", msg->data.c_str()); AzFramework::ConsoleRequestBus::Broadcast(&AzFramework::ConsoleRequests::ExecuteConsoleCommand, msg->data.c_str()); }); AzFramework::ConsoleNotificationBus::Handler::BusConnect(); +#endif } void ExposeConsoleToRosSystemComponent::OnConsoleCommandExecuted(const char* command) { - if (m_consolePublisher){ + if (m_consolePublisher) + { std_msgs::msg::String msg; msg.data = command; m_consolePublisher->publish(msg); diff --git a/Gems/ExposeConsoleToRos/Code/Source/Clients/ExposeConsoleToRosSystemComponent.h b/Gems/ExposeConsoleToRos/Code/Source/Clients/ExposeConsoleToRosSystemComponent.h index b5154e9..693183c 100644 --- a/Gems/ExposeConsoleToRos/Code/Source/Clients/ExposeConsoleToRosSystemComponent.h +++ b/Gems/ExposeConsoleToRos/Code/Source/Clients/ExposeConsoleToRosSystemComponent.h @@ -1,10 +1,10 @@ #pragma once -#include -#include #include "ROS2/ROS2Bus.h" #include "std_msgs/msg/string.hpp" +#include +#include #include namespace ExposeConsoleToRos