Skip to content
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.

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

Feature/extend osc support #650

Merged
merged 17 commits into from
Sep 17, 2024
Merged

Feature/extend osc support #650

merged 17 commits into from
Sep 17, 2024

Conversation

Robert108
Copy link
Collaborator

This PR introduces CustomCommandActions to ATOS which enables the user to specify add arbitrary actions to a scenario file and make ATOS publish the type and content of these actions in a ROS message of type CustomCommandAction.

The previous V2X/DEMN functionality is ported this new way of working and new REST gateway is added to enable the sending REST requests, triggered by a CustomCommandAction.

@Robert108
Copy link
Collaborator Author

Tests fails due to this issue in scenariogeneration pyoscx/scenariogeneration#243

Copy link
Contributor

@samuelthoren samuelthoren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix small issues as we discussed, otherwise good! 😎

atos/modules/RESTBridge/src/restbridge.cpp Outdated Show resolved Hide resolved
ros__parameters:
open_scenario_file: "scenario_name.xosc" # The name of the scenario to open. Located in the ~/.astazero/ATOS/osc directory.
active_object_names: ["object1", "object2"] # List of object names to be active in the scenario. An empty list means all objects are active.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a thought, should it be possible to have zero objects active?

Comment on lines 4 to 11
class CustomCommandAction:
def __init__(self, type: str, content: str):
self.type = type
self.content = content

def __eq__(self, other):
return self.type == other.type and self.content == other.content

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This deviates from how we handle ros channels in c++, maybe this class could be put somewhere else to promote uniformity.

@Robert108 Robert108 merged commit 0c282e8 into dev Sep 17, 2024
7 of 8 checks passed
@Robert108 Robert108 deleted the feature/extend_osc_support branch September 17, 2024 13:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants