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

Arpa 28 humble #8

Merged
merged 23 commits into from
Feb 3, 2025
Merged

Arpa 28 humble #8

merged 23 commits into from
Feb 3, 2025

Conversation

radishco
Copy link
Contributor

@radishco radishco commented Jan 6, 2025

PR Details

Description

Changed repo to have v2x-ros conversion to use the STOL APT repo for carma-j2735 encoding/decoding rather than using the files with the manual changes to them. This is for the humble version of the repo

Related GitHub Issue

Related Jira Key

ARPA-28

Motivation and Context

How Has This Been Tested?

Checked to see if dev container is able to launch. Once inside the dev container, the unit tests were tested to see if they pass as well as using roslaunch to launch the cpp_message node.

Types of changes

  • [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:

  • 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.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

radishco and others added 7 commits December 20, 2024 14:03
<!-- Thanks for the contribution, this is awesome. -->

# PR Details
## Description

Ported both cpp_message and j2735 convertor packages to new repo and is
able to build successfully. Unit tests for both packages pass as well.
This code should be merged into a branch "develop-foxy" since this build
uses the foxy version

## Related GitHub Issue

<!--- This project only accepts pull requests related to open GitHub
issues or Jira Keys -->
<!--- 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 DO NOT name partially fixed issues, instead open an issue
specific to this fix -->
<!--- Please link to the issue here: -->

## Related Jira Key

ARPA-4

## Motivation and Context

Both packages were ported to a new repository outside of CARMA messenger
to allow for both packages to be used by other projects aside from CARMA
messenger.

## How Has This Been Tested?

Unit tests were ran to ensure new package works as expected

## Types of changes

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

- [ ] Defect fix (non-breaking change that fixes an issue)
- [x ] 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.
- [x ] I have updated the documentation accordingly.
- [ ] I have read the
[**CONTRIBUTING**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md)
document.
- [ ] I have added tests to cover my changes.
- [x ] All new and existing tests passed.
@radishco radishco requested a review from adev4a January 6, 2025 18:44
@adev4a
Copy link
Contributor

adev4a commented Jan 30, 2025

Looks like this branch has diverged from develop. Let's rebase or merge develop into the branch and resolve the merge conflicts so we're only tracking the intended updates.

@adev4a
Copy link
Contributor

adev4a commented Jan 31, 2025

Looks like CI is failing because carma-j2735 wasn't found. That would need to be added as a step in the github workflow

# Testing
if(BUILD_TESTING)
target_link_libraries(${node_exec} ${node_lib})
target_include_directories(${node_exec}
Copy link
Contributor

Choose a reason for hiding this comment

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

Seems like we have target_link_libraries and target_include_directories specified twice and this second instance removes reference to stol-j2735

@@ -58,37 +63,43 @@ ament_auto_add_library(${node_lib} SHARED
)


add_library(testlib SHARED IMPORTED)
ament_target_dependencies(${node_lib}
Copy link
Contributor

Choose a reason for hiding this comment

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

This can be removed, class_loader is not used and rclcpp and rclcpp_components dependencies should be found by ament_auto_find_build_dependencies

@radishco radishco changed the title Arpa 18 humble Arpa 28 humble Feb 3, 2025
# Testing
if(BUILD_TESTING)
# target_link_libraries(${node_exec} ${node_lib})
# target_include_directories(${node_exec}
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we remove these commented lines?

carma_package()

find_package(ros_environment REQUIRED)
Copy link
Contributor

Choose a reason for hiding this comment

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

We can remove lines 22 and 24 here we dont need to check ros-version since this is meant for ros2-humble only

@radishco radishco merged commit 6f04136 into develop Feb 3, 2025
4 checks passed
@adev4a adev4a deleted the arpa-18-humble branch February 3, 2025 21:57
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.

2 participants