针对YJ时间戳协议创建分支YJ

YDLIDAR · Oct 25, 2023 · 67a720a · 67a720a
1 parent fdb7d1b
commit 67a720a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(ydlidar_sdk C CXX)
 # version
 set(YDLIDAR_SDK_VERSION_MAJOR 1)
 set(YDLIDAR_SDK_VERSION_MINOR 1)
-set(YDLIDAR_SDK_VERSION_PATCH 19)
+set(YDLIDAR_SDK_VERSION_PATCH 20)
 set(YDLIDAR_SDK_VERSION ${YDLIDAR_SDK_VERSION_MAJOR}.${YDLIDAR_SDK_VERSION_MINOR}.${YDLIDAR_SDK_VERSION_PATCH})
 
 ##########################################################

diff --git a/core/base/timer.h b/core/base/timer.h
@@ -3,6 +3,7 @@
 #include <assert.h>
 #include <time.h>
 #include <inttypes.h>
+#include "utils.h"
 
 
 #define BEGIN_STATIC_CODE( _blockname_ ) \
@@ -42,8 +43,8 @@ namespace impl {
 #if defined(_WIN32)
 void HPtimer_reset();
 #endif
-uint32_t getHDTimer();
-uint64_t getCurrentTime();
+YDLIDAR_API uint32_t getHDTimer();
+YDLIDAR_API uint64_t getCurrentTime();
 } // namespace impl
 
 

diff --git a/samples/scl_test.cpp b/samples/scl_test.cpp
@@ -330,7 +330,7 @@ int main(int argc, char *argv[])
   {
     if (laser.doProcessSimple(scan))
     {
-      printf("Scan received [%llu] points stamp [0x%"PRIx64"]\n",
+      printf("Scan received [%llu] points stamp [%llu]\n",
              scan.points.size(),
              scan.stamp);
       // for (size_t i = 0; i < scan.points.size(); ++i)

diff --git a/src/YDlidarDriver.cpp b/src/YDlidarDriver.cpp
@@ -1126,7 +1126,7 @@ bool YDlidarDriver::parseStampData(uint32_t timeout)
   if (hasStamp)
   {
     memcpy(&stamp, globalRecvBuffer, size);
-    printf("SCL stamp: %llu 0x%"PRIx64"\n", stamp, stamp);
+    //printf("SCL stamp: %llu 0x%"PRIx64"\n", stamp, stamp);
   }
 
   return hasStamp;

diff --git a/src/filters/NoiseFilter.h b/src/filters/NoiseFilter.h
@@ -13,7 +13,7 @@ struct FilterBlock
     int end_index;
 };
 
-class NoiseFilter : public FilterInterface
+class YDLIDAR_API NoiseFilter : public FilterInterface
 {
 public:
     enum FilterStrategy

diff --git a/src/filters/StrongLightFilter.h b/src/filters/StrongLightFilter.h
@@ -3,7 +3,7 @@
 #include "FilterInterface.h"
 
 //强光滤波器
-class StrongLightFilter : public FilterInterface
+class YDLIDAR_API StrongLightFilter : public FilterInterface
 {
 public:
     StrongLightFilter();