Merge branch 'feat/continental_drivers' of github.com:knzo25/nebula i…

…nto feat/continental_drivers
tier4 · Feb 16, 2024 · 95ef8a2 · 95ef8a2
2 parents 2801c8b + 858c011
commit 95ef8a2
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/nebula_decoders/CMakeLists.txt b/nebula_decoders/CMakeLists.txt
@@ -14,6 +14,7 @@ if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     add_compile_options(-Wall -Wextra -Wpedantic -Wunused-function)
 endif ()
 
+find_package(angles REQUIRED)
 find_package(PCL REQUIRED)
 find_package(pcl_conversions REQUIRED)
 find_package(yaml-cpp REQUIRED)

diff --git a/...oders/include/nebula_decoders/nebula_decoders_velodyne/decoders/velodyne_scan_decoder.hpp b/...oders/include/nebula_decoders/nebula_decoders_velodyne/decoders/velodyne_scan_decoder.hpp
@@ -12,12 +12,6 @@
 #include <string>
 #include <vector>
 
-#if defined(ROS_DISTRO_FOXY) || defined(ROS_DISTRO_GALACTIC)
-#include <angles/angles.h>  //Galactic
-#else
-#include <angles/angles/angles.h>  //Humble
-#endif
-
 #include "nebula_common/point_types.hpp"
 #include "nebula_common/velodyne/velodyne_calibration_decoder.hpp"
 #include "nebula_common/velodyne/velodyne_common.hpp"

diff --git a/nebula_decoders/src/nebula_decoders_velodyne/decoders/vlp16_decoder.cpp b/nebula_decoders/src/nebula_decoders_velodyne/decoders/vlp16_decoder.cpp
@@ -3,6 +3,8 @@
 #include <cmath>
 #include <utility>
 
+#include <angles/angles.h> 
+
 namespace nebula
 {
 namespace drivers

diff --git a/nebula_decoders/src/nebula_decoders_velodyne/decoders/vlp32_decoder.cpp b/nebula_decoders/src/nebula_decoders_velodyne/decoders/vlp32_decoder.cpp
@@ -3,6 +3,8 @@
 #include <cmath>
 #include <utility>
 
+#include <angles/angles.h> 
+
 namespace nebula
 {
 namespace drivers

diff --git a/nebula_decoders/src/nebula_decoders_velodyne/decoders/vls128_decoder.cpp b/nebula_decoders/src/nebula_decoders_velodyne/decoders/vls128_decoder.cpp
@@ -3,6 +3,8 @@
 #include <cmath>
 #include <utility>
 
+#include <angles/angles.h> 
+
 namespace nebula
 {
 namespace drivers

diff --git a/nebula_ros/launch/robosense_launch.all_hw.xml b/nebula_ros/launch/robosense_launch.all_hw.xml
@@ -5,8 +5,6 @@
     <arg name="frame_id" default="robosense"/>
     <arg name="scan_phase" default="0.0"/>
 
-    <arg name="calibration_file" default="$(find-pkg-share nebula_decoders)/calibration/robosense/Helios5515.csv"/>
-
     <arg name="sensor_ip" default="192.168.1.202" description="Lidar Sensor IP"/>
     <arg name="host_ip" default="192.168.1.201" description="Broadcast IP from Sensor"/>
     <arg name="data_port" default="6701" description="LiDAR Data Port"/>