From b520454a1409c709a01a7cd7900508241cf3c099 Mon Sep 17 00:00:00 2001 From: zhaoxi <535394140@qq.com> Date: Fri, 22 Nov 2024 15:05:25 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=96=20=E6=96=87=E6=A1=A3=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/tools/pyrmvl_fns.cfg | 8 ++++++++ modules/core/include/rmvl/core/io.hpp | 12 ++++++------ modules/opcua/CMakeLists.txt | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/doc/tools/pyrmvl_fns.cfg b/doc/tools/pyrmvl_fns.cfg index 8b53b18..9b83155 100644 --- a/doc/tools/pyrmvl_fns.cfg +++ b/doc/tools/pyrmvl_fns.cfg @@ -13,6 +13,14 @@ rm::PipeClient PipeClient name [[con]] rm::PipeClient read "" res,data rm::PipeClient write data res +###################################### ml ###################################### +rm::OnnxNet OnnxNet model_path,prov [[con]] +rm::OnnxNet printEnvInfo "" None +rm::OnnxNet printModelInfo "" None +rm::OnnxNet inference images,preop,postop res +rm::ClassificationNet ClassificationNet model_path,prov [[con]] +rm::ClassificationNet cast res idx,conf + ################################## algorithm ################################### rm::Polynomial Polynomial coeffs [[con]] rm::Polynomial [[call]] x fval diff --git a/modules/core/include/rmvl/core/io.hpp b/modules/core/include/rmvl/core/io.hpp index 4f7d36a..6186ced 100644 --- a/modules/core/include/rmvl/core/io.hpp +++ b/modules/core/include/rmvl/core/io.hpp @@ -168,6 +168,8 @@ struct RMVL_EXPORTS SerialPortMode //! 串行接口通信库 class RMVL_EXPORTS SerialPort { + RMVL_IMPL; + public: /** * @brief 构造新 SerialPort 对象 @@ -258,8 +260,6 @@ class RMVL_EXPORTS SerialPort //! 读取数据(基于文件描述符) long int fdread(void *data, size_t len); - - RMVL_IMPL; }; //////////////////////////////////// 进程间通信 //////////////////////////////////// @@ -301,7 +301,7 @@ class RMVL_EXPORTS_W PipeServer } //! @endcond - inline bool operator>>(std::string &data) { return read(data); } + inline PipeServer &operator>>(std::string &data) { return (read(data), *this); } /** * @brief 向管道写入数据 @@ -311,7 +311,7 @@ class RMVL_EXPORTS_W PipeServer */ RMVL_W bool write(std::string_view data); - inline bool operator<<(std::string_view data) { return write(data); } + inline PipeServer &operator<<(std::string_view data) { return (write(data), *this); } }; //! 命名管道客户端 @@ -348,7 +348,7 @@ class RMVL_EXPORTS_W PipeClient } //! @endcond - inline bool operator>>(std::string &data) { return read(data); } + inline PipeClient &operator>>(std::string &data) { return (read(data), *this); } /** * @brief 向管道写入数据 @@ -358,7 +358,7 @@ class RMVL_EXPORTS_W PipeClient */ RMVL_W bool write(std::string_view data); - inline bool operator<<(std::string_view data) { return write(data); } + inline PipeClient &operator<<(std::string_view data) { return (write(data), *this); } }; //! @} core_io diff --git a/modules/opcua/CMakeLists.txt b/modules/opcua/CMakeLists.txt index 39ab126..4c17507 100644 --- a/modules/opcua/CMakeLists.txt +++ b/modules/opcua/CMakeLists.txt @@ -19,7 +19,7 @@ if(BUILD_PYTHON) list(APPEND opcua_inc rmvl/opcua/${m}.hpp) endforeach() rmvl_generate_python(opcua - FILES ${opcua_inc} + FILES ${opcua_inc} rmvlpara/opcua.hpp DEPENDS opcua ) endif()