Skip to content

Commit 67dc371

Browse files
authored
Merge branch 'main' into update-codeowners-from-packages
2 parents aca1a08 + 4dc3080 commit 67dc371

File tree

3 files changed

+51
-48
lines changed

3 files changed

+51
-48
lines changed

sensing/gnss_poser/include/gnss_poser/gnss_poser_core.hpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -49,29 +49,29 @@ class GNSSPoser : public rclcpp::Node
4949
private:
5050
using MapProjectorInfo = map_interface::MapProjectorInfo;
5151

52-
void callbackMapProjectorInfo(const MapProjectorInfo::Message::ConstSharedPtr msg);
53-
void callbackNavSatFix(const sensor_msgs::msg::NavSatFix::ConstSharedPtr nav_sat_fix_msg_ptr);
54-
void callbackGnssInsOrientationStamped(
52+
void callback_map_projector_info(const MapProjectorInfo::Message::ConstSharedPtr msg);
53+
void callback_nav_sat_fix(const sensor_msgs::msg::NavSatFix::ConstSharedPtr nav_sat_fix_msg_ptr);
54+
void callback_gnss_ins_orientation_stamped(
5555
const autoware_sensing_msgs::msg::GnssInsOrientationStamped::ConstSharedPtr msg);
5656

57-
bool isFixed(const sensor_msgs::msg::NavSatStatus & nav_sat_status_msg);
58-
bool canGetCovariance(const sensor_msgs::msg::NavSatFix & nav_sat_fix_msg);
59-
geometry_msgs::msg::Point getMedianPosition(
57+
static bool is_fixed(const sensor_msgs::msg::NavSatStatus & nav_sat_status_msg);
58+
static bool can_get_covariance(const sensor_msgs::msg::NavSatFix & nav_sat_fix_msg);
59+
static geometry_msgs::msg::Point get_median_position(
6060
const boost::circular_buffer<geometry_msgs::msg::Point> & position_buffer);
61-
geometry_msgs::msg::Point getAveragePosition(
61+
static geometry_msgs::msg::Point get_average_position(
6262
const boost::circular_buffer<geometry_msgs::msg::Point> & position_buffer);
63-
geometry_msgs::msg::Quaternion getQuaternionByHeading(const int heading);
64-
geometry_msgs::msg::Quaternion getQuaternionByPositionDifference(
63+
static geometry_msgs::msg::Quaternion get_quaternion_by_heading(const int heading);
64+
static geometry_msgs::msg::Quaternion get_quaternion_by_position_difference(
6565
const geometry_msgs::msg::Point & point, const geometry_msgs::msg::Point & prev_point);
6666

67-
bool getTransform(
67+
bool get_transform(
6868
const std::string & target_frame, const std::string & source_frame,
6969
const geometry_msgs::msg::TransformStamped::SharedPtr transform_stamped_ptr);
70-
bool getStaticTransform(
70+
bool get_static_transform(
7171
const std::string & target_frame, const std::string & source_frame,
7272
const geometry_msgs::msg::TransformStamped::SharedPtr transform_stamped_ptr,
7373
const builtin_interfaces::msg::Time & stamp);
74-
void publishTF(
74+
void publish_tf(
7575
const std::string & frame_id, const std::string & child_frame_id,
7676
const geometry_msgs::msg::PoseStamped & pose_msg);
7777

@@ -99,7 +99,7 @@ class GNSSPoser : public rclcpp::Node
9999

100100
autoware_sensing_msgs::msg::GnssInsOrientationStamped::SharedPtr
101101
msg_gnss_ins_orientation_stamped_;
102-
int gnss_pose_pub_method;
102+
int gnss_pose_pub_method_;
103103
};
104104
} // namespace gnss_poser
105105

sensing/gnss_poser/src/gnss_poser_core.cpp

+37-34
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,27 @@ GNSSPoser::GNSSPoser(const rclcpp::NodeOptions & node_options)
3636
use_gnss_ins_orientation_(declare_parameter<bool>("use_gnss_ins_orientation")),
3737
msg_gnss_ins_orientation_stamped_(
3838
std::make_shared<autoware_sensing_msgs::msg::GnssInsOrientationStamped>()),
39-
gnss_pose_pub_method(declare_parameter<int>("gnss_pose_pub_method"))
39+
gnss_pose_pub_method_(static_cast<int>(declare_parameter<int>("gnss_pose_pub_method")))
4040
{
4141
// Subscribe to map_projector_info topic
4242
const auto adaptor = component_interface_utils::NodeAdaptor(this);
4343
adaptor.init_sub(
44-
sub_map_projector_info_,
45-
[this](const MapProjectorInfo::Message::ConstSharedPtr msg) { callbackMapProjectorInfo(msg); });
44+
sub_map_projector_info_, [this](const MapProjectorInfo::Message::ConstSharedPtr msg) {
45+
callback_map_projector_info(msg);
46+
});
4647

4748
// Set up position buffer
48-
int buff_epoch = declare_parameter<int>("buff_epoch");
49+
int buff_epoch = static_cast<int>(declare_parameter<int>("buff_epoch"));
4950
position_buffer_.set_capacity(buff_epoch);
5051

5152
// Set subscribers and publishers
5253
nav_sat_fix_sub_ = create_subscription<sensor_msgs::msg::NavSatFix>(
53-
"fix", rclcpp::QoS{1}, std::bind(&GNSSPoser::callbackNavSatFix, this, std::placeholders::_1));
54+
"fix", rclcpp::QoS{1},
55+
std::bind(&GNSSPoser::callback_nav_sat_fix, this, std::placeholders::_1));
5456
autoware_orientation_sub_ =
5557
create_subscription<autoware_sensing_msgs::msg::GnssInsOrientationStamped>(
5658
"autoware_orientation", rclcpp::QoS{1},
57-
std::bind(&GNSSPoser::callbackGnssInsOrientationStamped, this, std::placeholders::_1));
59+
std::bind(&GNSSPoser::callback_gnss_ins_orientation_stamped, this, std::placeholders::_1));
5860

5961
pose_pub_ = create_publisher<geometry_msgs::msg::PoseStamped>("gnss_pose", rclcpp::QoS{1});
6062
pose_cov_pub_ = create_publisher<geometry_msgs::msg::PoseWithCovarianceStamped>(
@@ -68,13 +70,13 @@ GNSSPoser::GNSSPoser(const rclcpp::NodeOptions & node_options)
6870
msg_gnss_ins_orientation_stamped_->orientation.rmse_rotation_z = 1.0;
6971
}
7072

71-
void GNSSPoser::callbackMapProjectorInfo(const MapProjectorInfo::Message::ConstSharedPtr msg)
73+
void GNSSPoser::callback_map_projector_info(const MapProjectorInfo::Message::ConstSharedPtr msg)
7274
{
7375
projector_info_ = *msg;
7476
received_map_projector_info_ = true;
7577
}
7678

77-
void GNSSPoser::callbackNavSatFix(
79+
void GNSSPoser::callback_nav_sat_fix(
7880
const sensor_msgs::msg::NavSatFix::ConstSharedPtr nav_sat_fix_msg_ptr)
7981
{
8082
// Return immediately if map_projector_info has not been received yet.
@@ -94,15 +96,15 @@ void GNSSPoser::callbackNavSatFix(
9496
}
9597

9698
// check fixed topic
97-
const bool is_fixed = isFixed(nav_sat_fix_msg_ptr->status);
99+
const bool is_status_fixed = is_fixed(nav_sat_fix_msg_ptr->status);
98100

99101
// publish is_fixed topic
100102
tier4_debug_msgs::msg::BoolStamped is_fixed_msg;
101103
is_fixed_msg.stamp = this->now();
102-
is_fixed_msg.data = is_fixed;
104+
is_fixed_msg.data = is_status_fixed;
103105
fixed_pub_->publish(is_fixed_msg);
104106

105-
if (!is_fixed) {
107+
if (!is_status_fixed) {
106108
RCLCPP_WARN_STREAM_THROTTLE(
107109
this->get_logger(), *this->get_clock(), std::chrono::milliseconds(1000).count(),
108110
"Not Fixed Topic. Skipping Calculate.");
@@ -122,7 +124,7 @@ void GNSSPoser::callbackNavSatFix(
122124
geometry_msgs::msg::Pose gnss_antenna_pose{};
123125

124126
// publish pose immediately
125-
if (!gnss_pose_pub_method) {
127+
if (!gnss_pose_pub_method_) {
126128
gnss_antenna_pose.position = position;
127129
} else {
128130
// fill position buffer
@@ -134,8 +136,9 @@ void GNSSPoser::callbackNavSatFix(
134136
return;
135137
}
136138
// publish average pose or median pose of position buffer
137-
gnss_antenna_pose.position = (gnss_pose_pub_method == 1) ? getAveragePosition(position_buffer_)
138-
: getMedianPosition(position_buffer_);
139+
gnss_antenna_pose.position = (gnss_pose_pub_method_ == 1)
140+
? get_average_position(position_buffer_)
141+
: get_median_position(position_buffer_);
139142
}
140143

141144
// calc gnss antenna orientation
@@ -144,7 +147,7 @@ void GNSSPoser::callbackNavSatFix(
144147
orientation = msg_gnss_ins_orientation_stamped_->orientation.orientation;
145148
} else {
146149
static auto prev_position = gnss_antenna_pose.position;
147-
orientation = getQuaternionByPositionDifference(gnss_antenna_pose.position, prev_position);
150+
orientation = get_quaternion_by_position_difference(gnss_antenna_pose.position, prev_position);
148151
prev_position = gnss_antenna_pose.position;
149152
}
150153

@@ -157,7 +160,7 @@ void GNSSPoser::callbackNavSatFix(
157160
auto tf_gnss_antenna2base_link_msg_ptr = std::make_shared<geometry_msgs::msg::TransformStamped>();
158161

159162
const std::string gnss_frame = nav_sat_fix_msg_ptr->header.frame_id;
160-
getStaticTransform(
163+
get_static_transform(
161164
gnss_frame, base_frame_, tf_gnss_antenna2base_link_msg_ptr, nav_sat_fix_msg_ptr->header.stamp);
162165
tf2::Transform tf_gnss_antenna2base_link{};
163166
tf2::fromMsg(tf_gnss_antenna2base_link_msg_ptr->transform, tf_gnss_antenna2base_link);
@@ -179,11 +182,11 @@ void GNSSPoser::callbackNavSatFix(
179182
gnss_base_pose_cov_msg.header = gnss_base_pose_msg.header;
180183
gnss_base_pose_cov_msg.pose.pose = gnss_base_pose_msg.pose;
181184
gnss_base_pose_cov_msg.pose.covariance[7 * 0] =
182-
canGetCovariance(*nav_sat_fix_msg_ptr) ? nav_sat_fix_msg_ptr->position_covariance[0] : 10.0;
185+
can_get_covariance(*nav_sat_fix_msg_ptr) ? nav_sat_fix_msg_ptr->position_covariance[0] : 10.0;
183186
gnss_base_pose_cov_msg.pose.covariance[7 * 1] =
184-
canGetCovariance(*nav_sat_fix_msg_ptr) ? nav_sat_fix_msg_ptr->position_covariance[4] : 10.0;
187+
can_get_covariance(*nav_sat_fix_msg_ptr) ? nav_sat_fix_msg_ptr->position_covariance[4] : 10.0;
185188
gnss_base_pose_cov_msg.pose.covariance[7 * 2] =
186-
canGetCovariance(*nav_sat_fix_msg_ptr) ? nav_sat_fix_msg_ptr->position_covariance[8] : 10.0;
189+
can_get_covariance(*nav_sat_fix_msg_ptr) ? nav_sat_fix_msg_ptr->position_covariance[8] : 10.0;
187190

188191
if (use_gnss_ins_orientation_) {
189192
gnss_base_pose_cov_msg.pose.covariance[7 * 3] =
@@ -201,30 +204,30 @@ void GNSSPoser::callbackNavSatFix(
201204
pose_cov_pub_->publish(gnss_base_pose_cov_msg);
202205

203206
// broadcast map to gnss_base_link
204-
publishTF(map_frame_, gnss_base_frame_, gnss_base_pose_msg);
207+
publish_tf(map_frame_, gnss_base_frame_, gnss_base_pose_msg);
205208
}
206209

207-
void GNSSPoser::callbackGnssInsOrientationStamped(
210+
void GNSSPoser::callback_gnss_ins_orientation_stamped(
208211
const autoware_sensing_msgs::msg::GnssInsOrientationStamped::ConstSharedPtr msg)
209212
{
210213
*msg_gnss_ins_orientation_stamped_ = *msg;
211214
}
212215

213-
bool GNSSPoser::isFixed(const sensor_msgs::msg::NavSatStatus & nav_sat_status_msg)
216+
bool GNSSPoser::is_fixed(const sensor_msgs::msg::NavSatStatus & nav_sat_status_msg)
214217
{
215218
return nav_sat_status_msg.status >= sensor_msgs::msg::NavSatStatus::STATUS_FIX;
216219
}
217220

218-
bool GNSSPoser::canGetCovariance(const sensor_msgs::msg::NavSatFix & nav_sat_fix_msg)
221+
bool GNSSPoser::can_get_covariance(const sensor_msgs::msg::NavSatFix & nav_sat_fix_msg)
219222
{
220223
return nav_sat_fix_msg.position_covariance_type >
221224
sensor_msgs::msg::NavSatFix::COVARIANCE_TYPE_UNKNOWN;
222225
}
223226

224-
geometry_msgs::msg::Point GNSSPoser::getMedianPosition(
227+
geometry_msgs::msg::Point GNSSPoser::get_median_position(
225228
const boost::circular_buffer<geometry_msgs::msg::Point> & position_buffer)
226229
{
227-
auto getMedian = [](std::vector<double> array) {
230+
auto get_median = [](std::vector<double> array) {
228231
std::sort(std::begin(array), std::end(array));
229232
const size_t median_index = array.size() / 2;
230233
double median = (array.size() % 2)
@@ -243,13 +246,13 @@ geometry_msgs::msg::Point GNSSPoser::getMedianPosition(
243246
}
244247

245248
geometry_msgs::msg::Point median_point;
246-
median_point.x = getMedian(array_x);
247-
median_point.y = getMedian(array_y);
248-
median_point.z = getMedian(array_z);
249+
median_point.x = get_median(array_x);
250+
median_point.y = get_median(array_y);
251+
median_point.z = get_median(array_z);
249252
return median_point;
250253
}
251254

252-
geometry_msgs::msg::Point GNSSPoser::getAveragePosition(
255+
geometry_msgs::msg::Point GNSSPoser::get_average_position(
253256
const boost::circular_buffer<geometry_msgs::msg::Point> & position_buffer)
254257
{
255258
std::vector<double> array_x;
@@ -271,7 +274,7 @@ geometry_msgs::msg::Point GNSSPoser::getAveragePosition(
271274
return average_point;
272275
}
273276

274-
geometry_msgs::msg::Quaternion GNSSPoser::getQuaternionByHeading(const int heading)
277+
geometry_msgs::msg::Quaternion GNSSPoser::get_quaternion_by_heading(const int heading)
275278
{
276279
int heading_conv = 0;
277280
// convert heading[0(North)~360] to yaw[-M_PI(West)~M_PI]
@@ -288,7 +291,7 @@ geometry_msgs::msg::Quaternion GNSSPoser::getQuaternionByHeading(const int headi
288291
return tf2::toMsg(quaternion);
289292
}
290293

291-
geometry_msgs::msg::Quaternion GNSSPoser::getQuaternionByPositionDifference(
294+
geometry_msgs::msg::Quaternion GNSSPoser::get_quaternion_by_position_difference(
292295
const geometry_msgs::msg::Point & point, const geometry_msgs::msg::Point & prev_point)
293296
{
294297
const double yaw = std::atan2(point.y - prev_point.y, point.x - prev_point.x);
@@ -297,7 +300,7 @@ geometry_msgs::msg::Quaternion GNSSPoser::getQuaternionByPositionDifference(
297300
return tf2::toMsg(quaternion);
298301
}
299302

300-
bool GNSSPoser::getTransform(
303+
bool GNSSPoser::get_transform(
301304
const std::string & target_frame, const std::string & source_frame,
302305
const geometry_msgs::msg::TransformStamped::SharedPtr transform_stamped_ptr)
303306
{
@@ -340,7 +343,7 @@ bool GNSSPoser::getTransform(
340343
return true;
341344
}
342345

343-
bool GNSSPoser::getStaticTransform(
346+
bool GNSSPoser::get_static_transform(
344347
const std::string & target_frame, const std::string & source_frame,
345348
const geometry_msgs::msg::TransformStamped::SharedPtr transform_stamped_ptr,
346349
const builtin_interfaces::msg::Time & stamp)
@@ -385,7 +388,7 @@ bool GNSSPoser::getStaticTransform(
385388
return true;
386389
}
387390

388-
void GNSSPoser::publishTF(
391+
void GNSSPoser::publish_tf(
389392
const std::string & frame_id, const std::string & child_frame_id,
390393
const geometry_msgs::msg::PoseStamped & pose_msg)
391394
{

sensing/pointcloud_preprocessor/docs/distortion-corrector.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Please note that the processing time difference between the two distortion metho
3636

3737
### Core Parameters
3838

39-
{{ json_to_markdown("sensing/pointcloud_preprocessor/schema/distortion_corrector.schema.json") }}
39+
{{ json_to_markdown("sensing/pointcloud_preprocessor/schema/distortion_corrector_node.schema.json") }}
4040

4141
## Launch
4242

0 commit comments

Comments
 (0)