Skip to content

Commit 1180cdd

Browse files
committedAug 26, 2022
support HAP linenum & custom msg
1 parent 0a2e9bc commit 1180cdd

File tree

460 files changed

+3131
-126189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

460 files changed

+3131
-126189
lines changed
 

‎.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.vscode
2+
build
3+
dedicated_sdk/build
4+
/CMakeList.txt
5+
package.xml

‎CMakeLists_ROS1.txt

+1-7
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,20 @@ set(CMAKE_CXX_EXTENSIONS OFF)
9090
## make sure the livox_sdk_static library is installed
9191
find_library(LIVOX_SDK_LIBRARY liblivox_sdk_static.a /usr/local/lib)
9292
find_library(LIVOX_SDK_VEHICLE_LIBRARY liblivox_sdk_vehicle_static.a /usr/local/lib)
93-
find_library(LIVOX_SDK_DIRECT_LIBRARY liblivox_sdk_direct_static.a /usr/local/lib)
9493
find_library(LIVOX_SDK_COMMON_LIBRARY liblivox_sdk_common_static.a /usr/local/lib)
9594
find_library(LIVOX_LIDAR_SDK_LIBRARY liblivox_lidar_sdk_static.a /usr/local/lib)
9695

9796
include_directories(
9897
./
9998
${CMAKE_CURRENT_SOURCE_DIR}/livox_sdk/sdk_core/include
10099
${CMAKE_CURRENT_SOURCE_DIR}/livox_sdk_vehicle/sdk_core/include
101-
${CMAKE_CURRENT_SOURCE_DIR}/livox_sdk_direct/sdk_core/include
102100
${CMAKE_CURRENT_SOURCE_DIR}/livox_sdk_common/include
103101
)
104102

105103
link_directories(
106104
./
107105
${CMAKE_CURRENT_SOURCE_DIR}/livox_sdk/build/sdk_core
108106
${CMAKE_CURRENT_SOURCE_DIR}/livox_sdk_vehicle/build/sdk_core
109-
${CMAKE_CURRENT_SOURCE_DIR}/livox_sdk_direct/build/sdk_core
110107
)
111108

112109

@@ -144,7 +141,7 @@ target_sources(${PROJECT_NAME}_node
144141
src/lds_lidar.cpp
145142
src/lds_hub.cpp
146143
src/lddc.cpp
147-
src/livox_ros_driver.cpp
144+
src/livox_ros_driver2.cpp
148145

149146
src/vehicle_lidar_thread.cpp
150147
src/comm/comm.cpp
@@ -154,14 +151,12 @@ target_sources(${PROJECT_NAME}_node
154151
src/comm/cache_index.cpp
155152

156153
src/parse_cfg_file/parse_cfg_file.cpp
157-
src/parse_cfg_file/parse_direct_lidar_cfg.cpp
158154
src/parse_cfg_file/parse_industrial_lidar_cfg.cpp
159155
src/parse_cfg_file/parse_vehicle_lidar_cfg.cpp
160156
src/parse_cfg_file/parse_livox_lidar_cfg.cpp
161157

162158
src/call_back/industrial_lidar_callback.cpp
163159
src/call_back/vehicle_lidar_callback.cpp
164-
src/call_back/direct_lidar_callback.cpp
165160
src/call_back/lidar_common_callback.cpp
166161
src/call_back/hub_callback.cpp
167162
src/call_back/livox_lidar_callback.cpp
@@ -196,7 +191,6 @@ target_include_directories(${PROJECT_NAME}_node
196191
target_link_libraries(${PROJECT_NAME}_node
197192
${LIVOX_SDK_LIBRARY}
198193
${LIVOX_SDK_VEHICLE_LIBRARY}
199-
${LIVOX_SDK_DIRECT_LIBRARY}
200194
${LIVOX_SDK_COMMON_LIBRARY}
201195
${LIVOX_LIDAR_SDK_LIBRARY}
202196
${Boost_LIBRARY}

0 commit comments

Comments
 (0)