SHERPA/sherpa_ros2_ws
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge conflicts

Browse Source
This commit is contained in:
SHERPA
2026-01-06 16:42:32 +01:00
parent ed031c9b8d
commit 3e6952cb59
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/target_tracking/launch/target_tracking_launch.py
View File

@@ -5,13 +5,8 @@ import math
################### user configure parameters for ros2 start ################### ################### user configure parameters for ros2 start ###################
# Topics/Frames # Topics/Frames
frame_id = 'velodyne' frame_id = 'velodyne'
<<<<<<< Updated upstream
topic_preprocessing_in = 'filtered_points'
topic_preprocessing_out = 'new_filtered'
=======
topic_preprocessing_in = 'merged_cloud' topic_preprocessing_in = 'merged_cloud'
topic_preprocessing_out = 'filtered_points' topic_preprocessing_out = 'filtered_points'
>>>>>>> Stashed changes
# Preprocessing # Preprocessing
x_min = 0.0 x_min = 0.0
@@ -22,23 +17,21 @@ tan_h_fov = math.pi / 4 # ±45°
tan_v_fov = math.pi / 6 # ±30° tan_v_fov = math.pi / 6 # ±30°
# Clustering # Clustering
<<<<<<< Updated upstream #z_dim_scale = 0.1
z_dim_scale = 0.1 #cluster_tolerance = 0.3
cluster_tolerance = 0.3 #min_cluster_size = 10
min_cluster_size = 10 #max_cluster_size = 1000
max_cluster_size = 1000
min_width = 0.0 min_width = 0.0
min_height = 0.0 min_height = 0.0
min_length = 0.0 min_length = 0.0
max_width = 1.5 max_width = 1.5
max_height = 2.5 max_height = 2.5
max_length = 1.5 max_length = 1.5
=======
z_dim_scale = 1.0 z_dim_scale = 1.0
cluster_tolerance = 0.1 cluster_tolerance = 0.1
min_cluster_size = 350 min_cluster_size = 350
max_cluster_size = 1500 max_cluster_size = 1500
>>>>>>> Stashed changes
################### user configure parameters for ros2 end ##################### ################### user configure parameters for ros2 end #####################

3
src/target_tracking/src/cloud_preprocessing.cpp
View File

@@ -158,7 +158,6 @@ private:
filtered_publisher_->publish(out_msg); filtered_publisher_->publish(out_msg);
//RCLCPP_INFO(this->get_logger(), "Filtered %zu -> %zu points", input->points.size(), voxel_filtered->points.size()); //RCLCPP_INFO(this->get_logger(), "Filtered %zu -> %zu points", input->points.size(), voxel_filtered->points.size());
<<<<<<< Updated upstream
//auto stop = std::chrono::high_resolution_clock::now(); //auto stop = std::chrono::high_resolution_clock::now();
//auto duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start); //auto duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start);
@@ -166,8 +165,6 @@ private:
// member function on the duration object // member function on the duration object
//std::cout << duration.count() << std::endl; //std::cout << duration.count() << std::endl;
=======
>>>>>>> Stashed changes
} }
tf2_ros::Buffer tf_buffer_; tf2_ros::Buffer tf_buffer_;