publish sonar values as pointcloud2

This commit is contained in:
Wojciech Kwolek 2021-04-30 13:48:56 +00:00
parent bfa763adb5
commit e0d20a5049
4 changed files with 20 additions and 5 deletions

View File

@ -6,4 +6,5 @@ void Ros2Aria::publish()
rclcpp::Time t = robot->getClock()->now(); rclcpp::Time t = robot->getClock()->now();
sensor_msgs::msg::PointCloud sonarData = handleSonar(t); sensor_msgs::msg::PointCloud sonarData = handleSonar(t);
publishSonar(sonarData); publishSonar(sonarData);
publishSonarPointCloud2(sonarData);
} }

View File

@ -15,6 +15,7 @@ Ros2Aria::Ros2Aria()
stop_service_ = this->create_service<std_srvs::srv::Empty>("stop", std::bind(&Ros2Aria::stop, this, _1, _2)); stop_service_ = this->create_service<std_srvs::srv::Empty>("stop", std::bind(&Ros2Aria::stop, this, _1, _2));
sonar_pub_ = this->create_publisher<sensor_msgs::msg::PointCloud>("sonar", 10); sonar_pub_ = this->create_publisher<sensor_msgs::msg::PointCloud>("sonar", 10);
sonar_pointcloud2_pub_ = this->create_publisher<sensor_msgs::msg::PointCloud2>("sonar_pointcloud2", 10);
// listen to sensors // listen to sensors
auto r = robot->getRobot(); auto r = robot->getRobot();

View File

@ -2,6 +2,7 @@
#include "Aria/Aria.h" #include "Aria/Aria.h"
#include "sensor_msgs/msg/point_cloud.hpp" #include "sensor_msgs/msg/point_cloud.hpp"
#include "sensor_msgs/msg/point_cloud2.hpp"
#include "geometry_msgs/msg/twist.hpp" #include "geometry_msgs/msg/twist.hpp"
#include "std_srvs/srv/empty.hpp" #include "std_srvs/srv/empty.hpp"
@ -25,8 +26,11 @@ private:
void publish(); void publish();
rclcpp::Publisher<sensor_msgs::msg::PointCloud>::SharedPtr sonar_pub_; rclcpp::Publisher<sensor_msgs::msg::PointCloud>::SharedPtr sonar_pub_;
rclcpp::Publisher<sensor_msgs::msg::PointCloud2>::SharedPtr sonar_pointcloud2_pub_;
sensor_msgs::msg::PointCloud handleSonar(rclcpp::Time stamp); sensor_msgs::msg::PointCloud handleSonar(rclcpp::Time stamp);
void publishSonar(sensor_msgs::msg::PointCloud cloud); void publishSonar(sensor_msgs::msg::PointCloud cloud);
void publishSonarPointCloud2(sensor_msgs::msg::PointCloud cloud);
// subscribers // subscribers
rclcpp::Subscription<geometry_msgs::msg::Twist>::SharedPtr cmd_vel_sub_; rclcpp::Subscription<geometry_msgs::msg::Twist>::SharedPtr cmd_vel_sub_;

View File

@ -1,5 +1,7 @@
#include "ros2aria.hpp" #include "ros2aria.hpp"
#include "sensor_msgs/point_cloud_conversion.hpp"
sensor_msgs::msg::PointCloud Ros2Aria::handleSonar(rclcpp::Time stamp) sensor_msgs::msg::PointCloud Ros2Aria::handleSonar(rclcpp::Time stamp)
{ {
sensor_msgs::msg::PointCloud cloud; //sonar readings. sensor_msgs::msg::PointCloud cloud; //sonar readings.
@ -20,14 +22,12 @@ sensor_msgs::msg::PointCloud Ros2Aria::handleSonar(rclcpp::Time stamp)
} }
// getRange() will return an integer between 0 and 5000 (5m) // getRange() will return an integer between 0 and 5000 (5m)
std::cout << reading->getRange() << " ";
// local (x,y). Appears to be from the centre of the robot, since values may // local (x,y). Appears to be from the centre of the robot, since values may
// exceed 5000. This is good, since it means we only need 1 transform. // exceed 5000. This is good, since it means we only need 1 transform.
// x & y seem to be swapped though, i.e. if the robot is driving north // x & y seem to be swapped though, i.e. if the robot is driving north
// x is north/south and y is east/west. // x is north/south and y is east/west.
// //
//ArPose sensor = reading->getSensorPosition(); //position of sensor. //ArPose sensor = reading->getSensorPosition(); //position sensor.
// sonar_debug_info << "(" << reading->getLocalX() // sonar_debug_info << "(" << reading->getLocalX()
// << ", " << reading->getLocalY() // << ", " << reading->getLocalY()
// << ") from (" << sensor.getX() << ", " // << ") from (" << sensor.getX() << ", "
@ -47,7 +47,16 @@ void Ros2Aria::publishSonar(sensor_msgs::msg::PointCloud cloud)
if (this->sonar_pub_->get_subscription_count() == 0) if (this->sonar_pub_->get_subscription_count() == 0)
return; return;
RCLCPP_INFO(this->get_logger(), "publishing sonar pointcloud");
this->sonar_pub_->publish(cloud); this->sonar_pub_->publish(cloud);
} }
void Ros2Aria::publishSonarPointCloud2(sensor_msgs::msg::PointCloud cloud)
{
if (this->sonar_pointcloud2_pub_->get_subscription_count() == 0)
return;
sensor_msgs::msg::PointCloud2 cloud2;
sensor_msgs::convertPointCloudToPointCloud2(cloud, cloud2);
this->sonar_pointcloud2_pub_->publish(cloud2);
}