Skip to content

Commit

Permalink
Fix/carma messenger cdasim config (#400)
Browse files Browse the repository at this point in the history
<!-- Thanks for the contribution, this is awesome. -->

# PR Details
Updates the xil_carma_messenger docker-compose to include a volume to
the routes directory and fixes the path pointed to in the launch
arguments.
## Description

<!--- Describe your changes in detail -->

## Related Issue

<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please link to the issue here: -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [x] Defect fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have added any new packages to the sonar-scanner.properties file
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [x] I have read the **CONTRIBUTING** document.
[CARMA Contributing
Guide](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md)
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
  • Loading branch information
adev4a authored Nov 22, 2024
1 parent 5de2243 commit 326e277
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion xil_carma_messenger/carma-messenger-docker.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def generate_launch_description():
route_file_folder = LaunchConfiguration('route_file_folder')
declare_route_file_folder = DeclareLaunchArgument(
name = 'route_file_folder',
default_value='/opt/messenger/messenger_1/routes/',
default_value='/opt/carma/routes/',
description = 'Path of folder on host PC containing route CSV file(s) that can be accessed by plugins'
)

Expand Down
3 changes: 2 additions & 1 deletion xil_carma_messenger/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ services:
volumes:
- /opt/carma-messenger/messenger_1/logs:/opt/carma/logs
- /opt/carma-messenger/messenger_1/.ros:/home/carma/.ros
- /opt/carma-messenger/messenger_1/vehicle:/opt/carma/vehicle
- /opt/carma-messenger/messenger_1/routes:/opt/carma/routes
- /opt/carma-messenger/messenger_1/vehicle/calibration:/opt/carma/vehicle/calibration
command: >
bash -c 'export RMW_IMPLEMENTATION=${RMW_IMPLEMENTATION_OVERWRITE} && source /opt/carma/install_ros2/setup.bash
&& ros2 launch /opt/carma/vehicle/config/carma-messenger-docker.launch.py'
Expand Down

0 comments on commit 326e277

Please sign in to comment.