Skip to content
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.

Sign up for GitHub

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

Introduce signal-to-noise ratio #24

Merged
merged 3 commits into from
Nov 11, 2022
Merged

Introduce signal-to-noise ratio #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3520da
Introduce signal-to-noise ratio
smartSRA Nov 10, 2022
6cb6ba5
Update release date
smartSRA Nov 10, 2022
84e37f0
Update release version
smartSRA Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,8 @@ Major release includes the new smartmicro sensor DRVEGRD 169. The driver offers

## v3.1.0 - 2022-10-19

This release includes the new smartmicro sensor DRVEGRD 152. The driver offers mode changes and configuration of the DRVEGRD 152 along with publishing the radar targets as pointcloud data. The callbacks for datastream now require a clientID.
This release includes the new smartmicro sensor DRVEGRD 152. The driver offers mode changes and configuration of the DRVEGRD 152 along with publishing the radar targets as pointcloud data. The callbacks for datastream now require a clientID.

## v3.2.0 - 2022-11-11

This minor release introduces signal-to-noise field in the pointclouds and also fixes the max number of sensors that could be connected at once.
2 changes: 1 addition & 1 deletion Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ A [smartmicro](https://www.smartmicro.com/automotive-radar) UMRR96, UMRR11, DRVE
required to run this node. This code is bundled with a version of Smart Access API. Please make
sure the version used to publish the data is compatible with this version:

- Date of release: `October 19, 2022`
- Date of release: `November 11, 2022`
- Smart Access Automotive version: `v2.1.0`
- User interface version: `UMRR96 Type 153 AUTOMOTIVE v1.2.1`
- User interface version: `UMRR11 Type 132 AUTOMOTIVE v1.1.1`
Expand Down
2 changes: 1 addition & 1 deletion umrr_ros2_driver/include/umrr_ros2_driver/smartmicro_radar_node.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace radar
{
namespace detail
{
constexpr auto kMaxSensorCount = 8UL;
constexpr auto kMaxSensorCount = 10UL;

struct SensorConfig
{
Expand Down
2 changes: 1 addition & 1 deletion umrr_ros2_driver/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>umrr_ros2_driver</name>
<version>3.0.0</version>
<version>3.2.0</version>
<description>A node to publish data from a smartmicro radar.</description>
<maintainer email="[email protected]">s.m.s, smart microwave sensors GmbH.</maintainer>
<license>Apache 2.0 License</license>
Expand Down
64 changes: 28 additions & 36 deletions umrr_ros2_driver/src/smartmicro_radar_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
#include <umrr11_t132_automotive_v1_1_1/comtargetlistport/Target.h>
#include <umrr96_t153_automotive_v1_2_1/comtargetlistport/GenericPortHeader.h>
#include <umrr96_t153_automotive_v1_2_1/comtargetlistport/Target.h>
#include <umrr9f_t169_automotive_v1_1_1/comtargetlistport/GenericPortHeader.h>
#include <umrr9f_t169_automotive_v1_1_1/comtargetlistport/Target.h>
#include <umrr9d_t152_automotive_v1_0_1/comtargetlistport/GenericPortHeader.h>
#include <umrr9d_t152_automotive_v1_0_1/comtargetlistport/Target.h>
#include <umrr9f_t169_automotive_v1_1_1/comtargetlistport/GenericPortHeader.h>
#include <umrr9f_t169_automotive_v1_1_1/comtargetlistport/Target.h>

#include <signal.h>

Expand All @@ -37,6 +37,7 @@
#include <fstream>
#include <limits>
#include <memory>

#include <set>
#include <string>
#include <thread>
Expand Down Expand Up @@ -96,22 +97,24 @@ struct RadarPoint
float power{};
float RCS{};
float Noise{};
float snr{};
constexpr friend bool operator==(const RadarPoint & p1, const RadarPoint & p2) noexcept
{
return float_eq(p1.x, p2.x) && float_eq(p1.y, p2.y) && float_eq(p1.z, p2.z) &&
float_eq(p1.radial_speed, p2.radial_speed) && float_eq(p1.power, p2.power) &&
float_eq(p1.RCS, p2.RCS) && float_eq(p1.Noise, p2.Noise);
float_eq(p1.RCS, p2.RCS) && float_eq(p1.Noise, p2.Noise) && float_eq(p1.snr, p2.snr);
}
};

LIDAR_UTILS__DEFINE_FIELD_GENERATOR_FOR_MEMBER(radial_speed);
LIDAR_UTILS__DEFINE_FIELD_GENERATOR_FOR_MEMBER(power);
LIDAR_UTILS__DEFINE_FIELD_GENERATOR_FOR_MEMBER(RCS);
LIDAR_UTILS__DEFINE_FIELD_GENERATOR_FOR_MEMBER(Noise);
LIDAR_UTILS__DEFINE_FIELD_GENERATOR_FOR_MEMBER(snr);
using Generators = std::tuple<
point_cloud_msg_wrapper::field_x_generator, point_cloud_msg_wrapper::field_y_generator,
point_cloud_msg_wrapper::field_z_generator, field_radial_speed_generator, field_RCS_generator,
field_Noise_generator, field_power_generator>;
field_Noise_generator, field_power_generator, field_snr_generator>;
using RadarCloudModifier = PointCloud2Modifier<RadarPoint, Generators>;

} // namespace
Expand Down Expand Up @@ -164,7 +167,7 @@ SmartmicroRadarNode::SmartmicroRadarNode(const rclcpp::NodeOptions & node_option
sensor.id, std::bind(
&SmartmicroRadarNode::targetlist_callback_umrr96, this, i,
std::placeholders::_1, std::placeholders::_2))) {
std::cout << "Failed to register targetlist callback for sensor umrr11" << std::endl;
std::cout << "Failed to register targetlist callback for sensor umrr96" << std::endl;
}
if (
sensor.model == "umrr9f" &&
Expand All @@ -173,17 +176,17 @@ SmartmicroRadarNode::SmartmicroRadarNode(const rclcpp::NodeOptions & node_option
sensor.id, std::bind(
&SmartmicroRadarNode::targetlist_callback_umrr9f, this, i,
std::placeholders::_1, std::placeholders::_2))) {
std::cout << "Failed to register targetlist callback for sensor umrr11" << std::endl;
std::cout << "Failed to register targetlist callback for sensor umrr9f" << std::endl;
}
if (
sensor.model == "umrr9d" &&
com::types::ERROR_CODE_OK !=
data_umrr9d->RegisterComTargetListPortReceiveCallback(
sensor.id, std::bind(
&SmartmicroRadarNode::targetlist_callback_umrr9d, this, i,
std::placeholders::_1, std::placeholders::_2))) {
std::cout <<"Failed to register targetlist callback for sensor umrr9d"<< std::endl;
}
&SmartmicroRadarNode::targetlist_callback_umrr9d, this, i,
std::placeholders::_1, std::placeholders::_2))) {
std::cout << "Failed to register targetlist callback for sensor umrr9d" << std::endl;
}

m_publishers[i] = create_publisher<sensor_msgs::msg::PointCloud2>(
"umrr/targets_" + std::to_string(i), sensor.history_size);
Expand Down Expand Up @@ -409,10 +412,11 @@ void SmartmicroRadarNode::targetlist_callback_umrr11(
const auto elevation_angle = target->GetElevationAngle();
const auto range_2d = range * std::cos(elevation_angle);
const auto azimuth_angle = target->GetAzimuthAngle();
const auto snr = target->GetPower() - target->GetTgtNoise();
modifier.push_back(
{range_2d * std::cos(azimuth_angle), range_2d * std::sin(azimuth_angle),
range * std::sin(elevation_angle), target->GetSpeedRadial(), target->GetRCS(),
target->GetTgtNoise(), target->GetPower()});
range * std::sin(elevation_angle), target->GetSpeedRadial(), target->GetPower(),
target->GetRCS(), target->GetTgtNoise(), snr});
}

m_publishers[sensor_idx]->publish(msg);
Expand Down Expand Up @@ -444,10 +448,11 @@ void SmartmicroRadarNode::targetlist_callback_umrr96(
const auto elevation_angle = target->GetElevationAngle();
const auto range_2d = range * std::cos(elevation_angle);
const auto azimuth_angle = target->GetAzimuthAngle();
const auto snr = target->GetPower() - target->GetTgtNoise();
modifier.push_back(
{range_2d * std::cos(azimuth_angle), range_2d * std::sin(azimuth_angle),
range * std::sin(elevation_angle), target->GetSpeedRadial(), target->GetRCS(),
target->GetTgtNoise(), target->GetPower()});
range * std::sin(elevation_angle), target->GetSpeedRadial(), target->GetPower(),
target->GetRCS(), target->GetTgtNoise(), snr});
}

m_publishers[sensor_idx]->publish(msg);
Expand Down Expand Up @@ -479,17 +484,11 @@ void SmartmicroRadarNode::targetlist_callback_umrr9f(
const auto elevation_angle = target->GetElevationAngle();
const auto range_2d = range * std::cos(elevation_angle);
const auto azimuth_angle = target->GetAzimuthAngle();
const auto snr = target->GetPower() - target->GetTgtNoise();
modifier.push_back(
{
range_2d * std::cos(azimuth_angle),
range_2d * std::sin(azimuth_angle),
range * std::sin(elevation_angle),
target->GetSpeedRadial(),
target->GetRCS(),
target->GetTgtNoise(),
target->GetPower()
}
);
{range_2d * std::cos(azimuth_angle), range_2d * std::sin(azimuth_angle),
range * std::sin(elevation_angle), target->GetSpeedRadial(), target->GetPower(),
target->GetRCS(), target->GetTgtNoise(), snr});
}

m_publishers[sensor_idx]->publish(msg);
Expand All @@ -504,7 +503,7 @@ void SmartmicroRadarNode::targetlist_callback_umrr9d(
const com::types::ClientId client_id)
{
std::cout << "Targetlist callback is being called for umrr9d" << std::endl;
if(!check_signal) {
if (!check_signal) {
std::shared_ptr<
com::master::umrr9d_t152_automotive_v1_0_1::comtargetlistport::GenericPortHeader>
port_header;
Expand All @@ -521,24 +520,17 @@ void SmartmicroRadarNode::targetlist_callback_umrr9d(
const auto elevation_angle = target->GetElevationAngle();
const auto range_2d = range * std::cos(elevation_angle);
const auto azimuth_angle = target->GetAzimuthAngle();
const auto snr = target->GetPower() - target->GetTgtNoise();
modifier.push_back(
{
range_2d * std::cos(azimuth_angle),
range_2d * std::sin(azimuth_angle),
range * std::sin(elevation_angle),
target->GetSpeedRadial(),
target->GetRCS(),
target->GetTgtNoise(),
target->GetPower()
}
);
{range_2d * std::cos(azimuth_angle), range_2d * std::sin(azimuth_angle),
range * std::sin(elevation_angle), target->GetSpeedRadial(), target->GetPower(),
target->GetRCS(), target->GetTgtNoise(), snr});
}

m_publishers[sensor_idx]->publish(msg);
}
}


void SmartmicroRadarNode::update_config_files_from_params()
{
const auto dev_id = declare_parameter(kDevIdTag, 0);
Expand Down