Merge pull request #68 from ethz-asl/fix/update_livox_callback_code

Fix compilation errors due to outdated Livox callback code
ethz-asl · Aug 30, 2024 · 964e740 · 964e740
2 parents 3f3f0cd + 10222b1
commit 964e740
Show file tree

Hide file tree

Showing 23 changed files with 53 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <package format="2">
   <name>wavemap_examples_ros1</name>
-  <version>2.0.0</version>
+  <version>2.0.1</version>
   <description>Usages examples for wavemap's ROS1 interface.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git 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
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <package format="2">
   <name>wavemap</name>
-  <version>2.0.0</version>
+  <version>2.0.1</version>
   <description>Base library for wavemap.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git 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
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <package format="2">
   <name>wavemap_all</name>
-  <version>2.0.0</version>
+  <version>2.0.1</version>
   <description>Metapackage that builds all wavemap packages.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git 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
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <package format="2">
   <name>wavemap_msgs</name>
-  <version>2.0.0</version>
+  <version>2.0.1</version>
   <description>Message definitions for wavemap's ROS interfaces.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git 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/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<void(PointcloudInput::*)(
+      registrar(static_cast<void(PointcloudTopicInput::*)(
                     const livox_ros_driver2::CustomMsg&)>(
-          &PointcloudInput::callback));
+          &PointcloudTopicInput::callback));
       // clang-format on
       return true;
 #else

diff --git a/interfaces/ros1/wavemap_ros/package.xml b/interfaces/ros1/wavemap_ros/package.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <package format="2">
   <name>wavemap_ros</name>
-  <version>2.0.0</version>
+  <version>2.0.1</version>
   <description>ROS interface for wavemap.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git 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);
   }

diff --git 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
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <package format="2">
   <name>wavemap_ros_conversions</name>
-  <version>2.0.0</version>
+  <version>2.0.1</version>
   <description>Conversions between wavemap and ROS types.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git 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
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <package format="2">
   <name>wavemap_rviz_plugin</name>
-  <version>2.0.0</version>
+  <version>2.0.1</version>
   <description>Plugin to interactively visualize maps published in wavemap's
     native format.
   </description>

diff --git 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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <package format="2">
     <name>catkin_setup</name>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <description>Dummy package to make it easy to setup the workspace and generate the setup.[sh|bash|zsh] scripts in CI.</description>
 
     <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git 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: