Skip to content

[2605] Fix build and remove obsolete files #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jhanca-robotecai merged 4 commits into from
Mar 25, 2026
Merged

[2605] Fix build and remove obsolete files #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9134eb
mp/scripttools/2605
michalpelka Mar 19, 2026
5aae09b
Remove unused files
jhanca-robotecai Mar 24, 2026
92be881
Fix README
jhanca-robotecai Mar 25, 2026
168d022
Fix formatting
jhanca-robotecai Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions Gems/ROS2ScriptIntegration/Code/Include/ROS2ScriptIntegration/ROS2ScriptIntegrationBus.h
View file
Open in desktop

This file was deleted.

16 changes: 7 additions & 9 deletions Gems/ROS2ScriptIntegration/Code/Include/ROS2ScriptIntegration/ROS2ScriptIntegrationTypeIds.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,21 @@

namespace ROS2ScriptIntegration
{
// System Component TypeIds
inline constexpr const char* ROS2ScriptIntegrationSystemComponentTypeId = "{9F27705B-7F94-47D6-BC9D-67C1541A68E2}";
inline constexpr const char* ROS2ScriptIntegrationEditorSystemComponentTypeId = "{60221622-30B3-4561-A082-9E306D2D252A}";

// Module derived classes TypeIds
inline constexpr const char* ROS2ScriptIntegrationModuleInterfaceTypeId = "{30EAAB05-7D98-4B7D-A461-8E5EEAF24F6A}";
inline constexpr const char* ROS2ScriptIntegrationModuleTypeId = "{2BE7A2BA-862D-42F0-B4F4-8C4746C08632}";
// The Editor Module by default is mutually exclusive with the Client Module
// so they use the Same TypeId
inline constexpr const char* ROS2ScriptIntegrationEditorModuleTypeId = ROS2ScriptIntegrationModuleTypeId;

inline constexpr const char* PublisherSystemComponentTypeId = "{6ee12dfa-5a6c-4223-b067-f798d9127840}";
inline constexpr const char* SubscriberSystemComponentTypeId = "{a30c445b-9a51-4036-871d-9f3b2917de58}";
inline constexpr const char* PublisherEditorSystemComponentTypeId = "{e31ac401-f40e-442a-8072-19d6c1f523f2}";
inline constexpr const char* SubscriberEditorSystemComponentTypeId = "{f4dba5a4-23da-463a-8d20-5866e897366f}";
inline constexpr const char* PublisherSystemComponentTypeId = "{6EE12DFA-5A6C-4223-B067-F798D9127840}";
inline constexpr const char* SubscriberSystemComponentTypeId = "{A30C445B-9A51-4036-871D-9F3B2917DE58}";
inline constexpr const char* PublisherEditorSystemComponentTypeId = "{E31AC401-F40E-442A-8072-19D6C1F523F2}";
inline constexpr const char* SubscriberEditorSystemComponentTypeId = "{F4DBA5A4-23DA-463A-8D20-5866E897366F}";

// Interface TypeIds
inline constexpr const char* ROS2ScriptIntegrationRequestsTypeId = "{BF116726-F2D1-44A2-ADE9-FB0047E6749D}";
inline constexpr const char* ROS2ScriptPublisherRequestsTypeId = "{B8356874-F7BA-4436-8D98-A342D7C720D9}";
inline constexpr const char* ROS2ScriptSubscriberRequestsTypeId = "{71935101-17DE-4636-97F8-DEA68938706D}";
inline constexpr const char* ROS2ScriptSubscriberNotificationsTypeId = "{A64EBBC0-3C6E-44F5-8A58-EA921AFA1C15}";

} // namespace ROS2ScriptIntegration
4 changes: 3 additions & 1 deletion Gems/ROS2ScriptIntegration/Code/Include/ROS2ScriptIntegration/ROS2ScriptPublisherBus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include "ROS2ScriptIntegrationTypeIds.h"

#include <AzCore/Component/EntityId.h>
#include <AzCore/EBus/EBus.h>
#include <AzCore/Interface/Interface.h>
Expand All @@ -22,7 +24,7 @@ namespace ROS2ScriptIntegration
class PublisherRequests : public AZ::EBusTraits
{
public:
AZ_RTTI(PublisherRequests, "{b8356874-f7ba-4436-8d98-a342d7c720d9}");
AZ_RTTI(PublisherRequests, ROS2ScriptPublisherRequestsTypeId);
static constexpr AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
static constexpr AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
virtual void PublishStdMsgString(const AZStd::string& topicName, const AZStd::string& value) = 0;
Expand Down
6 changes: 4 additions & 2 deletions Gems/ROS2ScriptIntegration/Code/Include/ROS2ScriptIntegration/ROS2ScriptSubscriberBus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include "ROS2ScriptIntegrationTypeIds.h"

#include <AzCore/Component/EntityId.h>
#include <AzCore/EBus/EBus.h>
#include <AzCore/Interface/Interface.h>
Expand Down Expand Up @@ -27,7 +29,7 @@ namespace ROS2ScriptIntegration
class SubscriberRequests : public AZ::EBusTraits
{
public:
AZ_RTTI(SubscriberRequests, "{71935101-17de-4636-97f8-dea68938706d}");
AZ_RTTI(SubscriberRequests, ROS2ScriptSubscriberRequestsTypeId);
static constexpr AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
static constexpr AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;

Expand All @@ -51,7 +53,7 @@ namespace ROS2ScriptIntegration
class SubscriberNotifications : public AZ::EBusTraits
{
public:
AZ_RTTI(SubscriberNotifications, "{a64ebbc0-3c6e-44f5-8a58-ea921afa1c15}");
AZ_RTTI(SubscriberNotifications, ROS2ScriptSubscriberNotificationsTypeId);
using BusIdType = AZStd::string;
static constexpr AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
static constexpr AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
Expand Down
2 changes: 2 additions & 0 deletions Gems/ROS2ScriptIntegration/Code/Source/Clients/PublisherSystemComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#include <AzCore/RTTI/BehaviorContext.h>
#include <AzCore/Serialization/SerializeContext.h>
#include <ROS2/Clock/ROS2ClockRequestBus.h>
#include <ROS2/ROS2Bus.h>

#include <ackermann_msgs/msg/ackermann_drive.hpp>
#include <geometry_msgs/msg/point32.hpp>
Expand Down
6 changes: 0 additions & 6 deletions Gems/ROS2ScriptIntegration/Code/Source/Clients/PublisherSystemComponent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,7 @@
#include "rclcpp/publisher.hpp"
#include "rclcpp/rclcpp.hpp"
#include <AzCore/Component/Component.h>
#include <AzCore/Component/TickBus.h>
#include <AzCore/std/parallel/shared_mutex.h>
#include <ROS2/ROS2Bus.h>
#include <ROS2/Utilities/ROS2Conversions.h>
#include <ROS2ScriptIntegration/ROS2ScriptIntegrationBus.h>
#include <ROS2ScriptIntegration/ROS2ScriptPublisherBus.h>
#include <ROS2ScriptIntegration/ROS2ScriptSubscriberBus.h>

namespace ROS2ScriptIntegration
{
Expand Down
1 change: 0 additions & 1 deletion Gems/ROS2ScriptIntegration/Code/Source/Clients/ROS2ScriptIntegrationModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

#include "ROS2ScriptIntegrationSystemComponent.h"
#include <ROS2ScriptIntegration/ROS2ScriptIntegrationTypeIds.h>
#include <ROS2ScriptIntegrationModuleInterface.h>

Expand Down
76 changes: 0 additions & 76 deletions Gems/ROS2ScriptIntegration/Code/Source/Clients/ROS2ScriptIntegrationSystemComponent.cpp
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions Gems/ROS2ScriptIntegration/Code/Source/Clients/ROS2ScriptIntegrationSystemComponent.h
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions Gems/ROS2ScriptIntegration/Code/Source/Clients/SubscriberSystemComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ namespace ROS2ScriptIntegration
void SubscriberSystemComponent::Reflect(AZ::ReflectContext* context)
{
SubscriberRequests::Reflect(context);
SubscriberNotificationHandler::Reflect(context);

if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
{
Expand Down
4 changes: 2 additions & 2 deletions Gems/ROS2ScriptIntegration/Code/Source/Clients/SubscriberSystemComponent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <AzCore/Component/Component.h>
#include <AzCore/Component/TickBus.h>
#include <AzCore/std/parallel/shared_mutex.h>
#include <ROS2ScriptIntegration/ROS2ScriptIntegrationBus.h>
#include <ROS2ScriptIntegration/ROS2ScriptPublisherBus.h>
#include <ROS2/ROS2Bus.h>
#include <ROS2/Utilities/ROS2Conversions.h>
#include <ROS2ScriptIntegration/ROS2ScriptSubscriberBus.h>

namespace ROS2ScriptIntegration
Expand Down
3 changes: 0 additions & 3 deletions Gems/ROS2ScriptIntegration/Code/Source/ROS2ScriptIntegrationModuleInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <ROS2ScriptIntegration/ROS2ScriptIntegrationTypeIds.h>

#include <Clients/PublisherSystemComponent.h>
#include <Clients/ROS2ScriptIntegrationSystemComponent.h>
#include <Clients/SubscriberSystemComponent.h>

namespace ROS2ScriptIntegration
Expand All @@ -26,7 +25,6 @@ namespace ROS2ScriptIntegration
m_descriptors.insert(
m_descriptors.end(),
{
ROS2ScriptIntegrationSystemComponent::CreateDescriptor(),
PublisherSystemComponent::CreateDescriptor(),
SubscriberSystemComponent::CreateDescriptor(),
});
Expand All @@ -35,7 +33,6 @@ namespace ROS2ScriptIntegration
AZ::ComponentTypeList ROS2ScriptIntegrationModuleInterface::GetRequiredSystemComponents() const
{
return AZ::ComponentTypeList{
azrtti_typeid<ROS2ScriptIntegrationSystemComponent>(),
azrtti_typeid<PublisherSystemComponent>(),
azrtti_typeid<SubscriberSystemComponent>(),
};
Expand Down
3 changes: 0 additions & 3 deletions Gems/ROS2ScriptIntegration/Code/Source/Tools/ROS2ScriptIntegrationEditorModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

#include "PublisherEditorSystemComponent.h"
#include "ROS2ScriptIntegrationEditorSystemComponent.h"
#include "SubscriberEditorSystemComponent.h"
#include <ROS2ScriptIntegration/ROS2ScriptIntegrationTypeIds.h>
#include <ROS2ScriptIntegrationModuleInterface.h>
Expand All @@ -23,7 +22,6 @@ namespace ROS2ScriptIntegration
m_descriptors.insert(
m_descriptors.end(),
{
ROS2ScriptIntegrationEditorSystemComponent::CreateDescriptor(),
PublisherEditorSystemComponent::CreateDescriptor(),
SubscriberEditorSystemComponent::CreateDescriptor(),
});
Expand All @@ -36,7 +34,6 @@ namespace ROS2ScriptIntegration
AZ::ComponentTypeList GetRequiredSystemComponents() const override
{
return AZ::ComponentTypeList{
azrtti_typeid<ROS2ScriptIntegrationEditorSystemComponent>(),
azrtti_typeid<PublisherEditorSystemComponent>(),
azrtti_typeid<SubscriberEditorSystemComponent>(),
};
Expand Down
66 changes: 0 additions & 66 deletions Gems/ROS2ScriptIntegration/Code/Source/Tools/ROS2ScriptIntegrationEditorSystemComponent.cpp
View file
Open in desktop

This file was deleted.

Loading
Loading