Skip to content

Commit d1d2197

Browse files
authored
Merge branch 'autowarefoundation:main' into obstacle_stop_planner
2 parents 2945835 + 87df6ad commit d1d2197

File tree

103 files changed

+3758
-2019
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+3758
-2019
lines changed

common/autoware_perception_rviz_plugin/include/autoware_perception_rviz_plugin/object_detection/object_polygon_detail.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ get_2d_shape_marker_ptr(
104104
AUTOWARE_PERCEPTION_RVIZ_PLUGIN_PUBLIC visualization_msgs::msg::Marker::SharedPtr
105105
get_label_marker_ptr(
106106
const geometry_msgs::msg::Point & centroid, const geometry_msgs::msg::Quaternion & orientation,
107-
const std::string label, const std_msgs::msg::ColorRGBA & color_rgba);
107+
const std::string & label, const std_msgs::msg::ColorRGBA & color_rgba);
108108

109109
AUTOWARE_PERCEPTION_RVIZ_PLUGIN_PUBLIC visualization_msgs::msg::Marker::SharedPtr
110110
get_existence_probability_marker_ptr(

common/autoware_perception_rviz_plugin/src/object_detection/object_polygon_detail.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ visualization_msgs::msg::Marker::SharedPtr get_uuid_marker_ptr(
459459

460460
visualization_msgs::msg::Marker::SharedPtr get_label_marker_ptr(
461461
const geometry_msgs::msg::Point & centroid, const geometry_msgs::msg::Quaternion & orientation,
462-
const std::string label, const std_msgs::msg::ColorRGBA & color_rgba)
462+
const std::string & label, const std_msgs::msg::ColorRGBA & color_rgba)
463463
{
464464
auto marker_ptr = std::make_shared<Marker>();
465465
marker_ptr->type = visualization_msgs::msg::Marker::TEXT_VIEW_FACING;

control/autoware_autonomous_emergency_braking/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@ rclcpp_components_register_node(${AEB_NODE}
3030
)
3131

3232
if(BUILD_TESTING)
33-
find_package(ament_lint_auto REQUIRED)
34-
ament_lint_auto_find_test_dependencies()
33+
ament_add_ros_isolated_gtest(test_aeb
34+
test/test.cpp)
35+
36+
target_link_libraries(test_aeb ${AEB_NODE})
37+
3538
endif()
3639

3740
ament_auto_package(

control/autoware_autonomous_emergency_braking/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ When vehicle odometry information is faulty, it is possible that the MPC fails t
197197
| use_predicted_trajectory | [-] | bool | flag to use the predicted path from the control module | true |
198198
| use_imu_path | [-] | bool | flag to use the predicted path generated by sensor data | true |
199199
| use_object_velocity_calculation | [-] | bool | flag to use the object velocity calculation. If set to false, object velocity is set to 0 [m/s] | true |
200+
| check_autoware_state | [-] | bool | flag to enable or disable autoware state check. If set to false, the AEB module will run even when the ego vehicle is not in AUTONOMOUS state. | true |
200201
| detection_range_min_height | [m] | double | minimum hight of detection range used for avoiding the ghost brake by false positive point clouds | 0.0 |
201202
| detection_range_max_height_margin | [m] | double | margin for maximum hight of detection range used for avoiding the ghost brake by false positive point clouds. `detection_range_max_height = vehicle_height + detection_range_max_height_margin` | 0.0 |
202203
| voxel_grid_x | [m] | double | down sampling parameters of x-axis for voxel grid filter | 0.05 |

control/autoware_autonomous_emergency_braking/config/autonomous_emergency_braking.param.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use_pointcloud_data: true
77
use_predicted_object_data: true
88
use_object_velocity_calculation: true
9+
check_autoware_state: true
910
min_generated_path_length: 0.5
1011
imu_prediction_time_horizon: 1.5
1112
imu_prediction_time_interval: 0.1

0 commit comments

Comments
 (0)