Skip to content

Commit

Permalink
Merge pull request #1643 from tier4/cherry-pick/aeb-latest-to-v4.0.0
Browse files Browse the repository at this point in the history
feat(autonomous_emergency_braking): cherry pick/aeb latest to v4.0.0
  • Loading branch information
TomohitoAndo authored Dec 13, 2024
2 parents 2b55cc9 + 7956221 commit 3088472
Show file tree
Hide file tree
Showing 19 changed files with 2,834 additions and 954 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ common/time_utils/** [email protected] [email protected] tomo
common/traffic_light_recognition_marker_publisher/** [email protected] [email protected] [email protected]
common/traffic_light_utils/** [email protected] [email protected] [email protected]
common/tvm_utility/** [email protected] [email protected]
control/autoware_autonomous_emergency_braking/** [email protected] [email protected] [email protected] [email protected]
control/autoware_autonomous_emergency_braking/** [email protected] [email protected] [email protected] [email protected] [email protected]
control/autoware_control_validator/** [email protected] [email protected] [email protected] [email protected] [email protected]
control/autoware_external_cmd_selector/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
control/autoware_joy_controller/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
Expand Down
14 changes: 12 additions & 2 deletions control/autoware_autonomous_emergency_braking/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,29 @@ include_directories(
${PCL_INCLUDE_DIRS}
)

ament_auto_add_library(autoware_autonomous_emergency_braking_helpers SHARED
include/autoware/autonomous_emergency_braking/utils.hpp
src/utils.cpp
)

set(AEB_NODE ${PROJECT_NAME}_node)
ament_auto_add_library(${AEB_NODE} SHARED
include/autoware/autonomous_emergency_braking/node.hpp
src/node.cpp
)

target_link_libraries(${AEB_NODE} autoware_autonomous_emergency_braking_helpers)
rclcpp_components_register_node(${AEB_NODE}
PLUGIN "autoware::motion::control::autonomous_emergency_braking::AEB"
EXECUTABLE ${PROJECT_NAME}
)

if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)
ament_lint_auto_find_test_dependencies()
ament_add_ros_isolated_gtest(test_aeb
test/test.cpp)

target_link_libraries(test_aeb ${AEB_NODE})

endif()

ament_auto_package(
Expand Down
136 changes: 88 additions & 48 deletions control/autoware_autonomous_emergency_braking/README.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,20 @@
# Ego path calculation
use_predicted_trajectory: true
use_imu_path: false
use_pointcloud_data: true
use_predicted_object_data: true
use_object_velocity_calculation: true
min_generated_path_length: 0.5
check_autoware_state: true
min_generated_imu_path_length: 0.5
max_generated_imu_path_length: 10.0
imu_prediction_time_horizon: 1.5
imu_prediction_time_interval: 0.1
mpc_prediction_time_horizon: 1.5
mpc_prediction_time_interval: 0.1

# Debug
publish_debug_pointcloud: false
publish_debug_markers: true

# Point cloud partitioning
detection_range_min_height: 0.0
Expand All @@ -23,9 +28,11 @@
# Point cloud cropping
expand_width: 0.1
path_footprint_extra_margin: 4.0
speed_calculation_expansion_margin: 0.5

# Point cloud clustering
cluster_tolerance: 0.1 #[m]
cluster_minimum_height: 0.0
minimum_cluster_size: 10
maximum_cluster_size: 10000

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
183 changes: 61 additions & 122 deletions control/autoware_autonomous_emergency_braking/image/rss_check.drawio.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
415 changes: 226 additions & 189 deletions control/autoware_autonomous_emergency_braking/image/wrong-mpc.drawio.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 3088472

Please sign in to comment.