reword later

nebula_ros/CMakeLists.txt

@@ -23,6 +23,7 @@ find_package(nebula_decoders REQUIRED)
 find_package(nebula_hw_interfaces REQUIRED)
 find_package(yaml-cpp REQUIRED)
 find_package(robosense_msgs REQUIRED)
+find_package(nebula_msgs REQUIRED)
 
 include_directories(
         include

nebula_ros/include/nebula_ros/hesai/hesai_ros_wrapper.hpp

@@ -15,8 +15,7 @@
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp_components/register_node_macro.hpp>
 
-#include "pandar_msgs/msg/pandar_packet.hpp"
-#include "pandar_msgs/msg/pandar_scan.hpp"
+#include "nebula_msgs/msg/nebula_packet.hpp"
 
 #include <boost/algorithm/string/join.hpp>
 #include <boost/asio.hpp>
@@ -72,23 +71,21 @@ class HesaiRosWrapper final : public rclcpp::Node, NebulaRosWrapperBase
   Status Shutdown() override;
 
 private:
-  /// @brief Initializing ros wrapper
+  /// @brief Initialize pointcloud decoder
   /// @param sensor_configuration SensorConfiguration for this driver
   /// @param calibration_configuration CalibrationConfiguration for this driver
-  /// @return Resulting status
-  Status InitializeCloudDriver(
-    std::shared_ptr<drivers::SensorConfigurationBase> sensor_configuration,
-    std::shared_ptr<drivers::CalibrationConfigurationBase> calibration_configuration) override;
-
-  /// @brief Initializing ros wrapper for AT
-  /// @param sensor_configuration SensorConfiguration for this driver
-  /// @param calibration_configuration CalibrationConfiguration for this driver
-  /// @param correction_configuration CorrectionConfiguration for this driver
+  /// @param correction_configuration CorrectionConfiguration for this driver (only for AT128, ignored otherwise)
   /// @return Resulting status
   Status InitializeCloudDriver(
     const std::shared_ptr<drivers::SensorConfigurationBase> & sensor_configuration,
     const std::shared_ptr<drivers::CalibrationConfigurationBase> & calibration_configuration,
-    const std::shared_ptr<drivers::HesaiCorrection> & correction_configuration);
+    const std::shared_ptr<drivers::HesaiCorrection> & correction_configuration = nullptr);
+
+  Status InitializeCloudDriver(
+    std::shared_ptr<drivers::SensorConfigurationBase> sensor_configuration,
+    std::shared_ptr<drivers::CalibrationConfigurationBase> calibration_configuration) {
+      return InitializeCloudDriver(sensor_configuration, calibration_configuration, nullptr);
+    }
 
   /// @brief Get configurations from ros parameters
   /// @param sensor_configuration Output of SensorConfiguration
@@ -188,7 +185,10 @@ class HesaiRosWrapper final : public rclcpp::Node, NebulaRosWrapperBase
 
   std::shared_ptr<drivers::HesaiDriver> driver_ptr_;
   Status wrapper_status_;
-  rclcpp::Subscription<pandar_msgs::msg::PandarScan>::SharedPtr pandar_scan_sub_;
+
+  rclcpp::Publisher<nebula_msgs::msg::NebulaPacket>::SharedPtr packet_pub_;
+  rclcpp::Subscription<nebula_msgs::msg::NebulaPacket>::SharedPtr packet_sub_;
+
   rclcpp::Publisher<sensor_msgs::msg::PointCloud2>::SharedPtr nebula_points_pub_;
   rclcpp::Publisher<sensor_msgs::msg::PointCloud2>::SharedPtr aw_points_ex_pub_;
   rclcpp::Publisher<sensor_msgs::msg::PointCloud2>::SharedPtr aw_points_base_pub_;

nebula_ros/launch/hesai_launch_all_hw.xml

@@ -27,8 +27,6 @@
     <arg name="ptp_domain" default="0" description="PTP Domain [0-127]."/>
     <arg name="ptp_transport_type" default="UDP" description="1588v2 supports 'UDP' or 'L2', other profiles only L2 (HW)"/>
     <arg name="ptp_switch_type" default="TSN" description="For automotive profile,'TSN' or 'NON_TSN'"/>
-    <arg name="delay_hw_ms" default="1000" description="hw driver startup delay in milliseconds."/>
-    <arg name="delay_monitor_ms" default="2000" description="hw monitor startup delay in milliseconds."/>
     <arg name="retry_hw" default="True" description="hw driver startup retry (false when using pcap)."/>
     <arg name="debug_logging" default="False" description="Launches Monitor/HW Interfaces and calibration acquisition"/>
 
@@ -55,14 +53,12 @@
         <param name="cloud_max_angle" value="$(var cloud_max_angle)"/>
         <param name="dual_return_distance_threshold" value="$(var dual_return_distance_threshold)"/>
         <param name="setup_sensor" value="$(var setup_sensor)"/>
-        <param name="delay_hw_ms" value="$(var delay_hw_ms)"/>
         <param name="retry_hw" value="$(var retry_hw)"/>
         <param name="ptp_profile" value="$(var ptp_profile)"/>
         <param name="ptp_domain" value="$(var ptp_domain)"/>
         <param name="ptp_transport_type" value="$(var ptp_transport_type)"/>
         <param name="ptp_switch_type" value="$(var ptp_switch_type)"/>
 
         <param name="diag_span" value="$(var diag_span)"/>
-        <param name="delay_monitor_ms" value="$(var delay_monitor_ms)"/>
     </node>
 </launch>

nebula_ros/package.xml

@@ -31,6 +31,7 @@
   <depend>velodyne_msgs</depend>
   <depend>visualization_msgs</depend>
   <depend>yaml-cpp</depend>
+  <depend>nebula_msgs</depend>
 
   <test_depend>ament_cmake_gtest</test_depend>
   <test_depend>ament_lint_auto</test_depend>