-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
AMCL Port #23
AMCL Port #23
Conversation
@@ -0,0 +1,44 @@ | |||
{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops. This file probably shouldn't be checked in.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed.
|
||
add_executable(amcl src/main.cpp src/amcl_node.cpp) | ||
|
||
target_link_libraries(amcl |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is unnecessary when using ament_target_dependencies below, I believe.
src/amcl/CMakeLists.txt
Outdated
include_directories(include ${Boost_INCLUDE_DIRS}) | ||
include_directories( | ||
include | ||
../util/include |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of adding util to the includes and link directories lines, we should be able to do a find_package(util REQUIRED)
The include and link directories will automatically be added by the ament_target_dependencies line. If this doesn't work, we should fix the util package.
src/amcl/CMakeLists.txt
Outdated
ARCHIVE DESTINATION lib | ||
LIBRARY DESTINATION lib | ||
RUNTIME DESTINATION bin | ||
) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to add these lines here:
ament_export_include_directories(include)
ament_export_libraries(amcl amcl_sensors amcl_map amcl_pf)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed.
src/amcl/src/amcl_node.cpp
Outdated
@@ -1282,24 +1145,24 @@ AmclNode::laserReceived(const sensor_msgs::LaserScanConstPtr& laser_scan) | |||
pf_matrix_t pose_cov; | |||
if (!pf_get_cluster_stats(pf_, hyp_count, &weight, &pose_mean, &pose_cov)) | |||
{ | |||
ROS_ERROR("Couldn't get stats on cluster %d", hyp_count); | |||
RCLCPP_ERROR(get_logger(), "Couldn't get stats on cluster %d", hyp_count); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There should be a name associated with the logger, IMHO. I'd go with something like get_logger("amcl")
This applies everywhere.
@mhpanah - this PR should be for the master branch, since it really has no dependencies on the ros2_devel branch. Can you re-submit to master please? |
@mhpanah - can we close this now since you have the PR to the master branch? |
* Add costmap downsampler - fixes SteveMacenski#4 * Improve costmap downsampler implementation Summary: - Optimized stack allocations - Use existing object for publishing costmap * Make downsampler work with time-variant costmap size * Move downsampled costmap publisher to downsampler * Add publisher to member list and use const-references where possible * Add downsampling factor as a param when calling downsample * Optimize for-loops during cost assignment * Use break instead of continue for exiting set cost loops * Revert "Use break instead of continue for exiting set cost loops" This reverts commit 94aac6d.
* new bt for obstacle replanning * fix according to comments * added RetryUntilSuccesful, fixed RCLCPP_ERROR logger; Co-authored-by: sofia.semianchuk <sofia.semianchuk@logivations.com>
Completed phase 1 of porting AMCL ROS1 package to ROS2. This phase has all the functionalities except dynamic reconfigure, rosbag, and laser scan subscriber which is equivalent to https://github.com/ros2/navigation/pull/9/files.