Skip to content

Commit

Permalink
Weekly merge humble (#249)
Browse files Browse the repository at this point in the history
<!-- Thanks for the contribution, this is awesome. -->

# PR Details
## Description
Resolving #246
<!--- Describe your changes in detail -->

## 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

<!-- e.g. CAR-123 -->

## 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: -->

- [ ] 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.
- [ ] 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.
- [ ] All new and existing tests passed.
  • Loading branch information
MishkaMN authored Dec 2, 2024
2 parents 481c0e6 + e9c0455 commit 29b460e
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 5 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/auto-merge-workflow.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Auto Merge develop to develop-humble

on:
schedule:
- cron: '0 0 * * 1' # Weekly on Monday
workflow_dispatch:

jobs:
call-merge-workflow:
uses: usdot-fhwa-stol/actions/.github/workflows/auto-pr-merge.yml@main
with:
branch_from: develop
branch_to: develop-humble
notify_team: DevOps
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@ def generate_launch_description():
description = 'Path of folder on host PC containing route CSV file(s) that can be accessed by plugins'
)

# Launch ROS2 rosbag logging
ros2_rosbag_launch = GroupAction(
actions=[
IncludeLaunchDescription(
PythonLaunchDescriptionSource([ThisLaunchFileDir(), '/ros2_rosbag.launch.py']),
)
]
)

transform_group = GroupAction(
actions=[
PushRosNamespace(EnvironmentVariable('CARMA_TF_NS', default_value='/')),
Expand All @@ -67,7 +76,7 @@ def generate_launch_description():
actions=[
IncludeLaunchDescription(
PythonLaunchDescriptionSource([ThisLaunchFileDir(), '/message.launch.py']),
launch_arguments = {
launch_arguments = {
'configuration_delay' : [configuration_delay]
}.items()
),
Expand All @@ -78,7 +87,7 @@ def generate_launch_description():
actions=[
IncludeLaunchDescription(
PythonLaunchDescriptionSource([ThisLaunchFileDir(), '/plugins.launch.py']),
launch_arguments = {
launch_arguments = {
'configuration_delay' : [configuration_delay],
'route_file_folder' : route_file_folder
}.items()
Expand Down Expand Up @@ -121,6 +130,7 @@ def generate_launch_description():
declare_configuration_delay_arg,
declare_use_rosbag,
declare_route_file_folder,
ros2_rosbag_launch,
transform_group,
v2x_group,
plugins_group,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2023 LEIDOS.
# Copyright (C) 2024 LEIDOS.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ class TrafficIncidentNode : public carma_ros2_utils::CarmaLifecycleNode
double down_track_;
double up_track_;
double min_gap_;
static constexpr double epsilon_ = 1e-6;
};

} // namespace traffic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,7 @@ bool TrafficIncidentNode::stopTrafficBroadcastCallback(
void TrafficIncidentNode::spin_callback(void)
{
if (
traffic_worker_.getDownTrack() > 0 && traffic_worker_.getUpTrack() > 0 &&
traffic_worker_.getMinGap() > 0 && traffic_worker_.getAdvisorySpeed() > 0) {
std::fabs(traffic_worker_.getDownTrack()) > epsilon_ || std::fabs(traffic_worker_.getUpTrack() > epsilon_) || std::fabs(traffic_worker_.getAdvisorySpeed() > epsilon_)) {
// construct local mobilityOperation msg
carma_v2x_msgs::msg::MobilityOperation traffic_mobility_msg =
traffic_worker_.mobilityMessageGenerator(traffic_worker_.getPinPoint());
Expand Down

0 comments on commit 29b460e

Please sign in to comment.