From ec5717602d724b88b2c36b9e4986900d3ffc1f2c Mon Sep 17 00:00:00 2001 From: Victor Reijgwart Date: Thu, 29 Aug 2024 15:56:49 +0200 Subject: [PATCH 1/2] Fix outdated Livox callback code Co-authored-by: Zhihuan Hu --- .../wavemap_ros/inputs/impl/pointcloud_topic_input_impl.h | 4 ++-- .../ros1/wavemap_ros/src/inputs/pointcloud_topic_input.cc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interfaces/ros1/wavemap_ros/include/wavemap_ros/inputs/impl/pointcloud_topic_input_impl.h b/interfaces/ros1/wavemap_ros/include/wavemap_ros/inputs/impl/pointcloud_topic_input_impl.h index 112e792a0..e913c7569 100644 --- a/interfaces/ros1/wavemap_ros/include/wavemap_ros/inputs/impl/pointcloud_topic_input_impl.h +++ b/interfaces/ros1/wavemap_ros/include/wavemap_ros/inputs/impl/pointcloud_topic_input_impl.h @@ -17,9 +17,9 @@ bool PointcloudTopicInput::registerCallback(PointcloudTopicType type, case PointcloudTopicType::kLivox: #ifdef LIVOX_AVAILABLE // clang-format off - registrar(static_cast( - &PointcloudInput::callback)); + &PointcloudTopicInput::callback)); // clang-format on return true; #else diff --git a/interfaces/ros1/wavemap_ros/src/inputs/pointcloud_topic_input.cc b/interfaces/ros1/wavemap_ros/src/inputs/pointcloud_topic_input.cc index a85081014..8d67c84fc 100644 --- a/interfaces/ros1/wavemap_ros/src/inputs/pointcloud_topic_input.cc +++ b/interfaces/ros1/wavemap_ros/src/inputs/pointcloud_topic_input.cc @@ -148,7 +148,7 @@ void PointcloudTopicInput::callback( } #ifdef LIVOX_AVAILABLE -void PointcloudInput::callback( +void PointcloudTopicInput::callback( const livox_ros_driver2::CustomMsg& pointcloud_msg) { ProfilerZoneScoped; // Skip empty clouds @@ -165,8 +165,8 @@ void PointcloudInput::callback( std::string sensor_frame_id = config_.sensor_frame_id.empty() ? pointcloud_msg.header.frame_id : config_.sensor_frame_id; - StampedPointcloud stamped_pointcloud{stamp_nsec, std::move(sensor_frame_id), - pointcloud_msg.points.size()}; + undistortion::StampedPointcloud stamped_pointcloud{ + stamp_nsec, std::move(sensor_frame_id), pointcloud_msg.points.size()}; for (const auto& point : pointcloud_msg.points) { stamped_pointcloud.emplace(point.x, point.y, point.z, point.offset_time); } From 10222b130d03f80494700e428f78f1d197fe38a3 Mon Sep 17 00:00:00 2001 From: Victor Reijgwart Date: Fri, 30 Aug 2024 11:28:12 +0200 Subject: [PATCH 2/2] Update changelogs --- examples/cpp/CHANGELOG.rst | 3 +++ examples/cpp/CMakeLists.txt | 2 +- examples/ros1/CHANGELOG.rst | 3 +++ examples/ros1/package.xml | 2 +- interfaces/ros1/wavemap/CHANGELOG.rst | 3 +++ interfaces/ros1/wavemap/package.xml | 2 +- interfaces/ros1/wavemap_all/CHANGELOG.rst | 3 +++ interfaces/ros1/wavemap_all/package.xml | 2 +- interfaces/ros1/wavemap_msgs/CHANGELOG.rst | 3 +++ interfaces/ros1/wavemap_msgs/package.xml | 2 +- interfaces/ros1/wavemap_ros/CHANGELOG.rst | 5 +++++ interfaces/ros1/wavemap_ros/package.xml | 2 +- interfaces/ros1/wavemap_ros_conversions/CHANGELOG.rst | 3 +++ interfaces/ros1/wavemap_ros_conversions/package.xml | 2 +- interfaces/ros1/wavemap_rviz_plugin/CHANGELOG.rst | 3 +++ interfaces/ros1/wavemap_rviz_plugin/package.xml | 2 +- library/cpp/CHANGELOG.rst | 3 +++ library/cpp/CMakeLists.txt | 2 +- tooling/packages/catkin_setup/CHANGELOG.rst | 3 +++ tooling/packages/catkin_setup/package.xml | 2 +- tooling/scripts/prepare_release.py | 9 ++++++--- 21 files changed, 48 insertions(+), 13 deletions(-) diff --git a/examples/cpp/CHANGELOG.rst b/examples/cpp/CHANGELOG.rst index 3d5d5cf09..b7a546dee 100644 --- a/examples/cpp/CHANGELOG.rst +++ b/examples/cpp/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package wavemap_examples_cpp ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.0.1 (2024-08-30) +------------------ + 2.0.0 (2024-08-12) ------------------ * New features diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt index f2a3a29bd..5b19a821b 100644 --- a/examples/cpp/CMakeLists.txt +++ b/examples/cpp/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(wavemap_examples_cpp VERSION 2.0.0 LANGUAGES CXX) +project(wavemap_examples_cpp VERSION 2.0.1 LANGUAGES CXX) # Load the wavemap library # First, try to load it from sources diff --git a/examples/ros1/CHANGELOG.rst b/examples/ros1/CHANGELOG.rst index 573ca5be2..49a86df74 100644 --- a/examples/ros1/CHANGELOG.rst +++ b/examples/ros1/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package wavemap_examples_ros1 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.0.1 (2024-08-30) +------------------ + 2.0.0 (2024-08-12) ------------------ * New features diff --git a/examples/ros1/package.xml b/examples/ros1/package.xml index a9b93e221..8e76a6b48 100644 --- a/examples/ros1/package.xml +++ b/examples/ros1/package.xml @@ -1,7 +1,7 @@ wavemap_examples_ros1 - 2.0.0 + 2.0.1 Usages examples for wavemap's ROS1 interface. Victor Reijgwart diff --git a/interfaces/ros1/wavemap/CHANGELOG.rst b/interfaces/ros1/wavemap/CHANGELOG.rst index b9bed7086..b6bcf515f 100644 --- a/interfaces/ros1/wavemap/CHANGELOG.rst +++ b/interfaces/ros1/wavemap/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package wavemap ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.0.1 (2024-08-30) +------------------ + 2.0.0 (2024-08-12) ------------------ * New features diff --git a/interfaces/ros1/wavemap/package.xml b/interfaces/ros1/wavemap/package.xml index b0ae4c148..a588047bb 100644 --- a/interfaces/ros1/wavemap/package.xml +++ b/interfaces/ros1/wavemap/package.xml @@ -1,7 +1,7 @@ wavemap - 2.0.0 + 2.0.1 Base library for wavemap. Victor Reijgwart diff --git a/interfaces/ros1/wavemap_all/CHANGELOG.rst b/interfaces/ros1/wavemap_all/CHANGELOG.rst index 68ad87482..efe351a9d 100644 --- a/interfaces/ros1/wavemap_all/CHANGELOG.rst +++ b/interfaces/ros1/wavemap_all/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package wavemap_all ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.0.1 (2024-08-30) +------------------ + 2.0.0 (2024-08-12) ------------------ * Make utility scripts ROS agnostic and remove wavemap_utils ROS pkg diff --git a/interfaces/ros1/wavemap_all/package.xml b/interfaces/ros1/wavemap_all/package.xml index 37f296d18..470a1744c 100644 --- a/interfaces/ros1/wavemap_all/package.xml +++ b/interfaces/ros1/wavemap_all/package.xml @@ -1,7 +1,7 @@ wavemap_all - 2.0.0 + 2.0.1 Metapackage that builds all wavemap packages. Victor Reijgwart diff --git a/interfaces/ros1/wavemap_msgs/CHANGELOG.rst b/interfaces/ros1/wavemap_msgs/CHANGELOG.rst index cc6e6d91f..e5fa70504 100644 --- a/interfaces/ros1/wavemap_msgs/CHANGELOG.rst +++ b/interfaces/ros1/wavemap_msgs/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package wavemap_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.0.1 (2024-08-30) +------------------ + 2.0.0 (2024-08-12) ------------------ * New features diff --git a/interfaces/ros1/wavemap_msgs/package.xml b/interfaces/ros1/wavemap_msgs/package.xml index 595eed117..5afc4f088 100644 --- a/interfaces/ros1/wavemap_msgs/package.xml +++ b/interfaces/ros1/wavemap_msgs/package.xml @@ -1,7 +1,7 @@ wavemap_msgs - 2.0.0 + 2.0.1 Message definitions for wavemap's ROS interfaces. Victor Reijgwart diff --git a/interfaces/ros1/wavemap_ros/CHANGELOG.rst b/interfaces/ros1/wavemap_ros/CHANGELOG.rst index 2ac848a4f..477dd5a1d 100644 --- a/interfaces/ros1/wavemap_ros/CHANGELOG.rst +++ b/interfaces/ros1/wavemap_ros/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package wavemap_ros ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.0.1 (2024-08-30) +------------------ +* Fix outdated Livox callback code +* Contributors: Zhihuan Hu, Victor Reijgwart + 2.0.0 (2024-08-12) ------------------ * New features diff --git a/interfaces/ros1/wavemap_ros/package.xml b/interfaces/ros1/wavemap_ros/package.xml index a0a1148dc..924616f5d 100644 --- a/interfaces/ros1/wavemap_ros/package.xml +++ b/interfaces/ros1/wavemap_ros/package.xml @@ -1,7 +1,7 @@ wavemap_ros - 2.0.0 + 2.0.1 ROS interface for wavemap. Victor Reijgwart diff --git a/interfaces/ros1/wavemap_ros_conversions/CHANGELOG.rst b/interfaces/ros1/wavemap_ros_conversions/CHANGELOG.rst index a778750b6..a20337f58 100644 --- a/interfaces/ros1/wavemap_ros_conversions/CHANGELOG.rst +++ b/interfaces/ros1/wavemap_ros_conversions/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package wavemap_ros_conversions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.0.1 (2024-08-30) +------------------ + 2.0.0 (2024-08-12) ------------------ * New features diff --git a/interfaces/ros1/wavemap_ros_conversions/package.xml b/interfaces/ros1/wavemap_ros_conversions/package.xml index 23e9e6c9b..37f9d27c5 100644 --- a/interfaces/ros1/wavemap_ros_conversions/package.xml +++ b/interfaces/ros1/wavemap_ros_conversions/package.xml @@ -1,7 +1,7 @@ wavemap_ros_conversions - 2.0.0 + 2.0.1 Conversions between wavemap and ROS types. Victor Reijgwart diff --git a/interfaces/ros1/wavemap_rviz_plugin/CHANGELOG.rst b/interfaces/ros1/wavemap_rviz_plugin/CHANGELOG.rst index 6eb690195..5f7b8887a 100644 --- a/interfaces/ros1/wavemap_rviz_plugin/CHANGELOG.rst +++ b/interfaces/ros1/wavemap_rviz_plugin/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package wavemap_rviz_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.0.1 (2024-08-30) +------------------ + 2.0.0 (2024-08-12) ------------------ * New features diff --git a/interfaces/ros1/wavemap_rviz_plugin/package.xml b/interfaces/ros1/wavemap_rviz_plugin/package.xml index eb076973f..568f05ff1 100644 --- a/interfaces/ros1/wavemap_rviz_plugin/package.xml +++ b/interfaces/ros1/wavemap_rviz_plugin/package.xml @@ -1,7 +1,7 @@ wavemap_rviz_plugin - 2.0.0 + 2.0.1 Plugin to interactively visualize maps published in wavemap's native format. diff --git a/library/cpp/CHANGELOG.rst b/library/cpp/CHANGELOG.rst index a26e886a1..359198578 100644 --- a/library/cpp/CHANGELOG.rst +++ b/library/cpp/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package wavemap ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.0.1 (2024-08-30) +------------------ + 2.0.0 (2024-08-12) ------------------ * New features diff --git a/library/cpp/CMakeLists.txt b/library/cpp/CMakeLists.txt index c186d2ca6..c854e93a1 100644 --- a/library/cpp/CMakeLists.txt +++ b/library/cpp/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(wavemap VERSION 2.0.0 LANGUAGES CXX) +project(wavemap VERSION 2.0.1 LANGUAGES CXX) # General options cmake_policy(SET CMP0077 NEW) diff --git a/tooling/packages/catkin_setup/CHANGELOG.rst b/tooling/packages/catkin_setup/CHANGELOG.rst index 9e668ae76..000c72387 100644 --- a/tooling/packages/catkin_setup/CHANGELOG.rst +++ b/tooling/packages/catkin_setup/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package catkin_setup ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.0.1 (2024-08-30) +------------------ + 2.0.0 (2024-08-12) ------------------ diff --git a/tooling/packages/catkin_setup/package.xml b/tooling/packages/catkin_setup/package.xml index 033c143ec..9768b3643 100644 --- a/tooling/packages/catkin_setup/package.xml +++ b/tooling/packages/catkin_setup/package.xml @@ -1,7 +1,7 @@ catkin_setup - 2.0.0 + 2.0.1 Dummy package to make it easy to setup the workspace and generate the setup.[sh|bash|zsh] scripts in CI. Victor Reijgwart diff --git a/tooling/scripts/prepare_release.py b/tooling/scripts/prepare_release.py index 812240c0a..33661aa16 100755 --- a/tooling/scripts/prepare_release.py +++ b/tooling/scripts/prepare_release.py @@ -128,7 +128,7 @@ def prepare_release_files(): for pkg in packages: # Package variables pkg_debug_name = f'{pkg.type} package {pkg.name}' - pkg_all_paths = pkg.old_paths.append(pkg.current_path) + pkg_all_paths = pkg.old_paths + [pkg.current_path] print(f'Processing {pkg_debug_name}') pkg_changelog_path = os.path.join(pkg.current_path, "CHANGELOG.rst") @@ -167,8 +167,11 @@ def prepare_release_files(): # Append the new section, below the changelog title changelog.insert(4, section_title + os.linesep) changelog.insert(5, section_title_underline + os.linesep) - changelog.insert(6, section_changelog + os.linesep) - changelog.insert(7, section_contributors + 2 * os.linesep) + if len(commit_msgs) == 0: + changelog.insert(6, os.linesep) + else: + changelog.insert(6, section_changelog + os.linesep) + changelog.insert(7, section_contributors + 2 * os.linesep) # Write the updated content back to the file with open(pkg_changelog_path, "w") as f: