Skip to content

Commit e19d768

Browse files
committed
chore: update version to 2.2.9
Signed-off-by: Pride Leong <lykling.lyk@gmail.com>
1 parent 29a1d61 commit e19d768

File tree

298 files changed

+19629
-3175
lines changed

Some content is hidden

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

298 files changed

+19629
-3175
lines changed

CMakeLists.txt

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if(WIN32)
66
cmake_policy(SET CMP0074 NEW) # CMake 3.12 required
77
endif(WIN32)
88

9-
project(vanjee_driver VERSION 2.0.15)
9+
project(vanjee_driver VERSION 2.2.9)
1010

1111
#=======================================
1212
# Code coverage detection (gcov)
@@ -49,7 +49,7 @@ option(ENABLE_DOUBLE_RCVBUF "Enable double size of RCVBUF" OFF)
4949
option(ENABLE_WAIT_IF_QUEUE_EMPTY "Enable waiting for a while in handle thread if the queue is empty" OFF)
5050
option(ENABLE_EPOLL_RECEIVE "Receive packets with epoll() instead of select()" OFF)
5151

52-
option(ENABLE_STAMP_WITH_LOCAL "Enable stamp point cloud with local time" OFF)
52+
option(ENABLE_TIMESTAMP_TRANS_WITH_LOCAL_TIME_ZONE "Enable transform timestamp to datetime with local time zone" OFF)
5353
option(ENABLE_PCL_POINTCLOUD "Enable PCL Point Cloud" OFF)
5454
option(ENABLE_GRAVITY_ACCELERATION_REMOVE "Enable Gravity acceleration remove" OFF)
5555

@@ -174,15 +174,6 @@ if(${ENABLE_GTEST})
174174
add_definitions("-DENABLE_GTEST")
175175
endif(${ENABLE_GTEST})
176176

177-
option(ENABLE_TBB "Enable TBB" OFF)
178-
179-
if(${ENABLE_TBB})
180-
add_definitions("-DENABLE_TBB")
181-
find_package(TBB REQUIRED)
182-
include_directories(${TBB_INCLUDE_DIR})
183-
184-
endif(${ENABLE_TBB})
185-
186177
#============================
187178
# Build Demos, Tools, Tests
188179
#============================
@@ -195,9 +186,9 @@ if(${ENABLE_WAIT_IF_QUEUE_EMPTY})
195186
add_definitions("-DENABLE_WAIT_IF_QUEUE_EMPTY")
196187
endif(${ENABLE_WAIT_IF_QUEUE_EMPTY})
197188

198-
if(${ENABLE_STAMP_WITH_LOCAL})
199-
add_definitions("-DENABLE_STAMP_WITH_LOCAL")
200-
endif(${ENABLE_STAMP_WITH_LOCAL})
189+
if(${ENABLE_TIMESTAMP_TRANS_WITH_LOCAL_TIME_ZONE})
190+
add_definitions("-DENABLE_TIMESTAMP_TRANS_WITH_LOCAL_TIME_ZONE")
191+
endif(${ENABLE_TIMESTAMP_TRANS_WITH_LOCAL_TIME_ZONE})
201192

202193
if(${ENABLE_PCL_POINTCLOUD})
203194
add_definitions("-DENABLE_PCL_POINTCLOUD")

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Redistribution and use in source and binary forms, with or without modification,
1414

1515
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
1616

17-
3. Neither the names of the Vanjee, nor Suteng Innovation Technology, nor the names of other contributors may be used to endorse or promote products derived from this software without specific prior written permission.
17+
3. Neither the names of the Vanjee, nor Wanji Technology, nor the names of other contributors may be used to endorse or promote products derived from this software without specific prior written permission.
1818

1919
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2020

README_CN.md

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,22 @@
1313
- vanjee_718h
1414
- vanjee_719
1515
- vanjee_719c
16+
- vanjee_719e
1617
- vanjee_720 / vanjee_720_16
1718
- vanjee_720_32
1819
- vanjee_721
1920
- vanjee_722
21+
- vanjee_722f
22+
- vanjee_722h
23+
- vanjee_722z
2024
- vanjee_733
2125
- vanjee_750
2226
- vanjee_760
2327

2428
## 3 支持的操作系统
2529

2630
支持的操作系统及编译器如下。注意编译器需支持C++14标准。
27-
- Ubuntu (16.04, 18.04, 20.04)
31+
- Ubuntu (16.04, 18.04, 20.04, 22.04, 24.04)
2832
- gcc (4.8+)
2933

3034
- Windows
@@ -123,6 +127,12 @@ Windows下,**vanjee_driver** 暂不支持安装。
123127

124128
**在执行以下步骤编译demo之前,请先确保已经按步骤5正确完成SDK编译和安装**
125129

130+
**如果编译或运行报错提示,无法找到 "libVanJeeLaser760Filter_linux.so" 需要做如下操作**
131+
```sh
132+
sudo cp <PROJECT_PATH>/src/vanjee_lidar_sdk/src/vanjee_driver/libVanJeeLaser760Filter_linux.so /usr/local/lib
133+
sudo ldconfig
134+
```
135+
126136
请按照以下方式之一完成demo编译
127137

128138
```bash
@@ -150,6 +160,12 @@ make -j4
150160

151161
**在执行以下步骤编译demo之前,请先确保已经按步骤5正确完成SDK编译和安装**
152162

163+
**如果编译或运行报错提示,无法找到 "libVanJeeLaser760Filter_linux.so" 需要做如下操作**
164+
```sh
165+
sudo cp <PROJECT_PATH>/src/vanjee_lidar_sdk/src/vanjee_driver/libVanJeeLaser760Filter_linux.so /usr/local/lib
166+
sudo ldconfig
167+
```
168+
153169
请按照以下方式之一完成tool编译
154170

155171
```bash
@@ -177,6 +193,12 @@ make -j4
177193

178194
## 9.1 编译和安装
179195

196+
**如果编译或运行报错提示,无法找到 "libVanJeeLaser760Filter_linux.so" 需要做如下操作**
197+
```sh
198+
sudo cp <PROJECT_PATH>/src/vanjee_lidar_sdk/src/vanjee_driver/libVanJeeLaser760Filter_linux.so /usr/local/lib
199+
sudo ldconfig
200+
```
201+
180202
请按照以下方式之一完成动态库编译。
181203

182204
```bash
@@ -234,4 +256,3 @@ make -j4
234256
- 接口定义: ```vanjee_driver/src/vanjee_driver/api/lidar_driver.hpp```
235257
- 参数定义: ```vanjee_driver/src/vanjee_driver/driver/driver_param.hpp```
236258
- 错误码定义: ```vanjee_driver/src/vanjee_driver/common/error_code.hpp```
237-

README_EN.md

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,22 @@ The supported LiDAR models are as follows.
1313
- vanjee_718h
1414
- vanjee_719
1515
- vanjee_719c
16+
- vanjee_719e
1617
- vanjee_720 / vanjee_720_16
1718
- vanjee_720_32
1819
- vanjee_721
1920
- vanjee_722
21+
- vanjee_722f
22+
- vanjee_722h
23+
- vanjee_722z
2024
- vanjee_733
2125
- vanjee_750
2226
- vanjee_760
2327

2428
## 3 Supported Operating Systems
2529

2630
The supported operating systems and compilers are as follows. Note that the compiler must support the C++14 standard.
27-
- Ubuntu (16.04, 18.04, 20.04)
31+
- Ubuntu (16.04, 18.04, 20.04, 22.04, 24.04)
2832
- gcc (4.8+)
2933

3034
- Windows
@@ -123,6 +127,12 @@ On Windows, **vanjee_driver** does not support installation at this time.
123127

124128
Please complete the demo compilation using one of the following methods.
125129

130+
**If there is an error message indicating that "libVanJeeLaser760Filter_linux.so" cannot be found during compilation or execution, the following steps should be taken**
131+
```sh
132+
sudo cp <PROJECT_PATH>/src/vanjee_lidar_sdk/src/vanjee_driver/libVanJeeLaser760Filter_linux.so /usr/local/lib
133+
sudo ldconfig
134+
```
135+
126136
```bash
127137
cd vanjee_driver
128138
mkdir build && cd build
@@ -150,6 +160,12 @@ For more information about `demo_pcap`, refer to[Decoding PCAP Files](doc/howto/
150160

151161
Please complete the tool compilation using one of the following methods.
152162

163+
**If there is an error message indicating that "libVanJeeLaser760Filter_linux.so" cannot be found during compilation or execution, the following steps should be taken**
164+
```sh
165+
sudo cp <PROJECT_PATH>/src/vanjee_lidar_sdk/src/vanjee_driver/libVanJeeLaser760Filter_linux.so /usr/local/lib
166+
sudo ldconfig
167+
```
168+
153169
```bash
154170
cd vanjee_driver
155171
mkdir build && cd build
@@ -178,6 +194,12 @@ For usage instructions on `vanjee_driver_viewer`, please refer to the [Visualiza
178194

179195
Please complete the dynamic library compilation in one of the following ways.
180196

197+
**If there is an error message indicating that "libVanJeeLaser760Filter_linux.so" cannot be found during compilation or execution, the following steps should be taken**
198+
```sh
199+
sudo cp <PROJECT_PATH>/src/vanjee_lidar_sdk/src/vanjee_driver/libVanJeeLaser760Filter_linux.so /usr/local/lib
200+
sudo ldconfig
201+
```
202+
181203
```bash
182204
cd vanjee_driver
183205
mkdir build && cd build
@@ -234,4 +256,3 @@ The main interface files for **vanjee_driver** are as follows.
234256
- Interface Definition: ```vanjee_driver/src/vanjee_driver/api/lidar_driver.hpp```
235257
- Parameter Definition: ```vanjee_driver/src/vanjee_driver/driver/driver_param.hpp```
236258
- Error Code Definition: ```vanjee_driver/src/vanjee_driver/common/error_code.hpp```
237-

cmake/vanjee_driverConfigVersion.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
set (PACKAGE_VERSION "2.0.15")
2+
set (PACKAGE_VERSION "2.2.9")
33
message(=============================================================)
44
message("-- vanjee_driver Version : v${PACKAGE_VERSION}")
55
message(=============================================================)

demo/CMakeLists.txt

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,10 @@ if(${ENABLE_GTEST})
4242
add_definitions("-DENABLE_GTEST")
4343
endif(${ENABLE_GTEST})
4444

45-
option(ENABLE_TBB "Enable TBB" OFF)
46-
if(${ENABLE_TBB})
47-
48-
add_definitions("-DENABLE_TBB")
49-
find_package(TBB REQUIRED)
50-
include_directories(${TBB_INCLUDE_DIR})
51-
52-
endif(${ENABLE_TBB})
45+
option(ENABLE_TIMESTAMP_TRANS_WITH_LOCAL_TIME_ZONE "Enable transform timestamp to datetime with local time zone" OFF)
46+
if(${ENABLE_TIMESTAMP_TRANS_WITH_LOCAL_TIME_ZONE})
47+
add_definitions("-DENABLE_TIMESTAMP_TRANS_WITH_LOCAL_TIME_ZONE")
48+
endif(${ENABLE_TIMESTAMP_TRANS_WITH_LOCAL_TIME_ZONE})
5349

5450
option(ENABLE_GRAVITY_ACCELERATION_REMOVE "Enable Gravity acceleration remove" OFF)
5551
if(${ENABLE_GRAVITY_ACCELERATION_REMOVE})
@@ -59,25 +55,35 @@ endif(${ENABLE_GRAVITY_ACCELERATION_REMOVE})
5955
find_package(vanjee_driver REQUIRED)
6056
include_directories(${VANJEE_DRIVER_INCLUDE_DIRS})
6157

58+
get_filename_component(LIB_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
59+
find_library(VANJEE_FILTER_LIB
60+
NAMES VanJeeLaser760Filter_linux
61+
PATHS ${LIB_DIR}
62+
)
63+
64+
if((VANJEE_FILTER_LIB))
65+
message(STATUS "Found dynamic library")
66+
add_definitions(-DFILTER_DLL_ENABLE)
67+
endif()
68+
6269
add_executable(demo_online
6370
demo_online.cpp)
6471
target_link_libraries(demo_online
6572
${EXTERNAL_LIBS} ${VANJEE_DRIVER_LIBRARIES})
6673

67-
if(${ENABLE_TBB})
68-
target_link_libraries(demo_online
69-
TBB::tbb)
70-
endif(${ENABLE_TBB})
74+
if((VANJEE_FILTER_LIB))
75+
target_link_libraries(demo_online ${VANJEE_FILTER_LIB})
76+
endif()
7177

7278
add_executable(demo_online_multi_lidars
7379
demo_online_multi_lidars.cpp)
7480

7581
target_link_libraries(demo_online_multi_lidars
7682
${EXTERNAL_LIBS} ${VANJEE_DRIVER_LIBRARIES})
77-
if(${ENABLE_TBB})
78-
target_link_libraries(demo_online_multi_lidars
79-
TBB::tbb)
80-
endif(${ENABLE_TBB})
83+
84+
if((VANJEE_FILTER_LIB))
85+
target_link_libraries(demo_online_multi_lidars ${VANJEE_FILTER_LIB})
86+
endif()
8187

8288
if(NOT ${DISABLE_PCAP_PARSE})
8389

@@ -86,10 +92,10 @@ add_executable(demo_pcap
8692

8793
target_link_libraries(demo_pcap
8894
${EXTERNAL_LIBS} ${VANJEE_DRIVER_LIBRARIES})
89-
if(${ENABLE_TBB})
90-
target_link_libraries(demo_pcap
91-
TBB::tbb)
92-
endif(${ENABLE_TBB})
95+
96+
if((VANJEE_FILTER_LIB))
97+
target_link_libraries(demo_pcap ${VANJEE_FILTER_LIB})
98+
endif()
9399

94100
else()
95101

0 commit comments

Comments
 (0)