Merge branch 'dev' into 'master'

Update driver core See merge request rs_share/rslidar/rslidar_sdk!4
RoboSense-LiDAR · Sep 4, 2020 · 73b4c66 · 73b4c66
2 parents 667acfa + e968b82
commit 73b4c66
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## v1.2.1 - 2020-09-04
+
+### Fixed
+
+- Fix bug in driver core, please refer to changelog in rs_driver for details.
+
+
 ## v1.2.0 - 2020-09-01
 
 ### Added

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ set(COMPILE_METHOD ORIGINAL)
 #========================
 set (PROJECT_VERSION_MAJOR 1)
 set (PROJECT_VERSION_MINOR 2)
-set (PROJECT_VERSION_PATCH 0)
+set (PROJECT_VERSION_PATCH 1)
 
 #========================
 # Project details / setup

diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ Ubuntu 18.04 - 安装ROS2 Eloquent desktop
 
 **注意！ 请避免在同一台电脑上同时安装ROS和ROS2， 这可能会产生冲突！ 同时还需要手动安装Yaml库**。
 
-### 3.5 Yaml (必需)
+### 3.3 Yaml (必需)
 
 版本号:  >= v0.5.2 
 
@@ -65,7 +65,7 @@ sudo apt-get update
 sudo apt-get install -y libyaml-cpp-dev
 ```
 
-### 3.6 Pcap (必需)
+### 3.4 Pcap (必需)
 
 版本号： >=v1.7.4
 
@@ -75,7 +75,7 @@ sudo apt-get install -y libyaml-cpp-dev
 sudo apt-get install -y  libpcap-dev
 ```
 
-### 3.7 Protobuf (可选)
+### 3.5 Protobuf (可选)
 
 版本号： >=v2.6.1
 

diff --git a/src/rs_driver b/src/rs_driver