Skip to content

Commit 16a71ce

Browse files
Merge branch 'awf-latest' into feat/keep_distance_back_static_objects_from_start_pose
2 parents b73b55c + 1121f3b commit 16a71ce

File tree

42 files changed

+41
-3575
lines changed

Some content is hidden

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

42 files changed

+41
-3575
lines changed

launch/tier4_perception_launch/launch/object_recognition/detection/detector/camera_lidar_detector.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<arg name="image_number" default="1" description="choose image raw number(1-8)"/>
3838

3939
<!-- Jetson AGX -->
40-
<!-- <include file="$(find-pkg-share tensorrt_yolo)/launch/yolo.launch.xml">
40+
<!-- <include file="$(find-pkg-share tensorrt_yolox)/launch/multiple_yolox.launch.xml">
4141
<arg name="image_raw0" value="$(var image_raw0)"/>
4242
<arg name="image_raw1" value="$(var image_raw1)"/>
4343
<arg name="image_raw2" value="$(var image_raw2)"/>

launch/tier4_perception_launch/launch/traffic_light_recognition/traffic_light.launch.xml

+6-4
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,11 @@
4646
<push-ros-namespace namespace="detection"/>
4747
<include file="$(find-pkg-share traffic_light_map_based_detector)/launch/traffic_light_map_based_detector.launch.xml">
4848
<arg name="input/camera_info" value="$(var input/camera_info)"/>
49-
<arg name="min_timestamp_offset" value="-0.3"/>
5049
<arg name="expect/rois" value="expect/rois"/>
5150
<arg name="output/rois" value="$(var map_based_detector_output_topic)"/>
52-
<arg name="output/camera_info" value="camera_info"/>
51+
<!-- This parameter should be configured differently for each camera considering their delay. -->
52+
<arg name="min_timestamp_offset" value="-0.3"/>
53+
<arg name="max_timestamp_offset" value="0.0"/>
5354
</include>
5455
</group>
5556

@@ -100,10 +101,11 @@
100101
<push-ros-namespace namespace="detection"/>
101102
<include file="$(find-pkg-share traffic_light_map_based_detector)/launch/traffic_light_map_based_detector.launch.xml">
102103
<arg name="input/camera_info" value="$(var input/camera_info)"/>
103-
<arg name="min_timestamp_offset" value="-0.04"/>
104104
<arg name="expect/rois" value="expect/rois"/>
105105
<arg name="output/rois" value="$(var map_based_detector_output_topic)"/>
106-
<arg name="output/camera_info" value="camera_info"/>
106+
<!-- This parameter should be configured differently for each camera considering their delay. -->
107+
<arg name="min_timestamp_offset" value="-0.04"/>
108+
<arg name="max_timestamp_offset" value="0.0"/>
107109
</include>
108110
</group>
109111

perception/object_velocity_splitter/src/object_velocity_splitter_node/object_velocity_splitter_node.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ ObjectVelocitySplitterNode::ObjectVelocitySplitterNode(const rclcpp::NodeOptions
5353
std::bind(&ObjectVelocitySplitterNode::onSetParam, this, std::placeholders::_1));
5454

5555
// Node Parameter
56-
node_param_.velocity_threshold = declare_parameter<double>("velocity_threshold", 3.0);
56+
node_param_.velocity_threshold = declare_parameter<double>("velocity_threshold");
5757

5858
// Subscriber
5959
sub_objects_ = create_subscription<DetectedObjects>(

perception/radar_crossing_objects_noise_filter/src/radar_crossing_objects_noise_filter_node/radar_crossing_objects_noise_filter_node.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ RadarCrossingObjectsNoiseFilterNode::RadarCrossingObjectsNoiseFilterNode(
6464
std::bind(&RadarCrossingObjectsNoiseFilterNode::onSetParam, this, std::placeholders::_1));
6565

6666
// Node Parameter
67-
node_param_.angle_threshold = declare_parameter<double>("angle_threshold", 1.0472);
68-
node_param_.velocity_threshold = declare_parameter<double>("velocity_threshold", 3.0);
67+
node_param_.angle_threshold = declare_parameter<double>("angle_threshold");
68+
node_param_.velocity_threshold = declare_parameter<double>("velocity_threshold");
6969

7070
// Subscriber
7171
sub_objects_ = create_subscription<DetectedObjects>(

perception/radar_tracks_msgs_converter/src/radar_tracks_msgs_converter_node/radar_tracks_msgs_converter_node.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,12 @@ RadarTracksMsgsConverterNode::RadarTracksMsgsConverterNode(const rclcpp::NodeOpt
7878
std::bind(&RadarTracksMsgsConverterNode::onSetParam, this, _1));
7979

8080
// Node Parameter
81-
node_param_.update_rate_hz = declare_parameter<double>("update_rate_hz", 20.0);
82-
node_param_.new_frame_id = declare_parameter<std::string>("new_frame_id", "base_link");
83-
node_param_.use_twist_compensation = declare_parameter<bool>("use_twist_compensation", false);
84-
node_param_.use_twist_yaw_compensation =
85-
declare_parameter<bool>("use_twist_yaw_compensation", false);
81+
node_param_.update_rate_hz = declare_parameter<double>("update_rate_hz");
82+
node_param_.new_frame_id = declare_parameter<std::string>("new_frame_id");
83+
node_param_.use_twist_compensation = declare_parameter<bool>("use_twist_compensation");
84+
node_param_.use_twist_yaw_compensation = declare_parameter<bool>("use_twist_yaw_compensation");
8685
node_param_.static_object_speed_threshold =
87-
declare_parameter<float>("static_object_speed_threshold", 1.0);
86+
declare_parameter<float>("static_object_speed_threshold");
8887

8988
// Subscriber
9089
sub_radar_ = create_subscription<RadarTracks>(

perception/simple_object_merger/src/simple_object_merger_node/simple_object_merger_node.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ SimpleObjectMergerNode::SimpleObjectMergerNode(const rclcpp::NodeOptions & node_
8080
std::bind(&SimpleObjectMergerNode::onSetParam, this, std::placeholders::_1));
8181

8282
// Node Parameter
83-
node_param_.update_rate_hz = declare_parameter<double>("update_rate_hz", 20.0);
84-
node_param_.new_frame_id = declare_parameter<std::string>("new_frame_id", "base_link");
85-
node_param_.timeout_threshold = declare_parameter<double>("timeout_threshold", 0.1);
83+
node_param_.update_rate_hz = declare_parameter<double>("update_rate_hz");
84+
node_param_.new_frame_id = declare_parameter<std::string>("new_frame_id");
85+
node_param_.timeout_threshold = declare_parameter<double>("timeout_threshold");
8686

8787
declare_parameter("input_topics", std::vector<std::string>());
8888
node_param_.topic_names = get_parameter("input_topics").as_string_array();

perception/tensorrt_yolo/.gitignore

-2
This file was deleted.

perception/tensorrt_yolo/CMakeLists.txt

-162
This file was deleted.

perception/tensorrt_yolo/README.md

-117
This file was deleted.

perception/tensorrt_yolo/config/yolov3.param.yaml

-10
This file was deleted.

perception/tensorrt_yolo/config/yolov4-tiny.param.yaml

-10
This file was deleted.

0 commit comments

Comments
 (0)