Merge branch '1.x' into serial-port-update

cv-rmvl · Nov 20, 2024 · 6eb82a9 · 6eb82a9
2 parents cd66ad0 + 29cd19f
commit 6eb82a9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/modules/core/include/rmvl/core/io.hpp b/modules/core/include/rmvl/core/io.hpp
@@ -207,7 +207,7 @@ class RMVL_EXPORTS SerialPort
 
 private:
     //! 写入数据（基于文件描述符）
-    long int fdwrite(void *data, size_t len);
+    long int fdwrite(const void *data, size_t len);
 
     //! 读取数据（基于文件描述符）
     long int fdread(void *data, size_t len);

diff --git a/modules/core/src/io_impl.hpp b/modules/core/src/io_impl.hpp
@@ -35,9 +35,9 @@ class SerialPort::Impl
     void close();
 
     //! 串口是否打开
-    inline bool isOpened() const { return _is_open; };
+    inline bool isOpened() const { return _is_open; }
     //! 写入数据
-    long int fdwrite(void *data, std::size_t len);
+    long int fdwrite(const void *data, std::size_t len);
     //! 读取数据
     long int fdread(void *data, std::size_t len);
 

diff --git a/modules/core/src/serial.cpp b/modules/core/src/serial.cpp
@@ -55,7 +55,7 @@ int getBaudRate(BaudRate baud_rate)
 
 SerialPort::SerialPort(std::string_view device, BaudRate baud_rate) : _impl(new Impl(device, baud_rate)) {}
 bool SerialPort::isOpened() const { return _impl->isOpened(); }
-long int SerialPort::fdwrite(void *data, size_t length) { return _impl->fdwrite(data, length); }
+long int SerialPort::fdwrite(const void *data, size_t length) { return _impl->fdwrite(data, length); }
 long int SerialPort::fdread(void *data, size_t len) { return _impl->fdread(data, len); }
 
 #ifdef _WIN32
@@ -166,7 +166,7 @@ void SerialPort::Impl::close()
     _is_open = false;
 }
 
-long int SerialPort::Impl::fdwrite(void *data, std::size_t length)
+long int SerialPort::Impl::fdwrite(const void *data, std::size_t length)
 {
     ssize_t len_result = -1;
     if (_is_open)