Skip to content

Commit 3088472

Browse files
authored
Merge pull request #1643 from tier4/cherry-pick/aeb-latest-to-v4.0.0
feat(autonomous_emergency_braking): cherry pick/aeb latest to v4.0.0
2 parents 2b55cc9 + 7956221 commit 3088472

19 files changed

+2834
-954
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ common/time_utils/** christopherj.ho@gmail.com shumpei.wakabayashi@tier4.jp tomo
4444
common/traffic_light_recognition_marker_publisher/** shumpei.wakabayashi@tier4.jp takeshi.miura@tier4.jp tomoya.kimura@tier4.jp
4545
common/traffic_light_utils/** kotaro.uetake@tier4.jp satoshi.ota@tier4.jp shunsuke.miura@tier4.jp
4646
common/tvm_utility/** ambroise.vincent@arm.com xinyu.wang@tier4.jp
47-
control/autoware_autonomous_emergency_braking/** daniel.sanchez@tier4.jp mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp tomoya.kimura@tier4.jp
47+
control/autoware_autonomous_emergency_braking/** daniel.sanchez@tier4.jp mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp tomoya.kimura@tier4.jp kyoichi.sugahara@tier4.jp
4848
control/autoware_control_validator/** kyoichi.sugahara@tier4.jp makoto.kurihara@tier4.jp mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp
4949
control/autoware_external_cmd_selector/** fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp
5050
control/autoware_joy_controller/** fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp

control/autoware_autonomous_emergency_braking/CMakeLists.txt

+12-2
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,29 @@ include_directories(
1212
${PCL_INCLUDE_DIRS}
1313
)
1414

15+
ament_auto_add_library(autoware_autonomous_emergency_braking_helpers SHARED
16+
include/autoware/autonomous_emergency_braking/utils.hpp
17+
src/utils.cpp
18+
)
19+
1520
set(AEB_NODE ${PROJECT_NAME}_node)
1621
ament_auto_add_library(${AEB_NODE} SHARED
22+
include/autoware/autonomous_emergency_braking/node.hpp
1723
src/node.cpp
1824
)
1925

26+
target_link_libraries(${AEB_NODE} autoware_autonomous_emergency_braking_helpers)
2027
rclcpp_components_register_node(${AEB_NODE}
2128
PLUGIN "autoware::motion::control::autonomous_emergency_braking::AEB"
2229
EXECUTABLE ${PROJECT_NAME}
2330
)
2431

2532
if(BUILD_TESTING)
26-
find_package(ament_lint_auto REQUIRED)
27-
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+
2838
endif()
2939

3040
ament_auto_package(

control/autoware_autonomous_emergency_braking/README.md

+88-48
Large diffs are not rendered by default.

control/autoware_autonomous_emergency_braking/config/autonomous_emergency_braking.param.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,20 @@
33
# Ego path calculation
44
use_predicted_trajectory: true
55
use_imu_path: false
6+
use_pointcloud_data: true
7+
use_predicted_object_data: true
68
use_object_velocity_calculation: true
7-
min_generated_path_length: 0.5
9+
check_autoware_state: true
10+
min_generated_imu_path_length: 0.5
11+
max_generated_imu_path_length: 10.0
812
imu_prediction_time_horizon: 1.5
913
imu_prediction_time_interval: 0.1
1014
mpc_prediction_time_horizon: 1.5
1115
mpc_prediction_time_interval: 0.1
1216

1317
# Debug
1418
publish_debug_pointcloud: false
19+
publish_debug_markers: true
1520

1621
# Point cloud partitioning
1722
detection_range_min_height: 0.0
@@ -23,9 +28,11 @@
2328
# Point cloud cropping
2429
expand_width: 0.1
2530
path_footprint_extra_margin: 4.0
31+
speed_calculation_expansion_margin: 0.5
2632

2733
# Point cloud clustering
2834
cluster_tolerance: 0.1 #[m]
35+
cluster_minimum_height: 0.0
2936
minimum_cluster_size: 10
3037
maximum_cluster_size: 10000
3138

control/autoware_autonomous_emergency_braking/image/closest-point.drawio.svg

+245
Loading

control/autoware_autonomous_emergency_braking/image/obstacle_filtering_2.drawio.svg

+232-343
Loading

control/autoware_autonomous_emergency_braking/image/rss_check.drawio.svg

+61-122
Loading

control/autoware_autonomous_emergency_braking/image/speed_calculation_expansion.drawio.svg

+234
Loading

control/autoware_autonomous_emergency_braking/image/using-predicted-objects.drawio.svg

+114
Loading

control/autoware_autonomous_emergency_braking/image/wrong-mpc.drawio.svg

+226-189
Loading

0 commit comments

Comments
 (0)