From eff87241aaf65b433aab96b0d8a7ce0261c4d9dc Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 28 Oct 2023 12:48:17 +0800 Subject: [PATCH] update --- api/zi_module.hpp | 4 ++-- cmdid.hpp | 4 ++-- protocol_parser.cpp | 8 ++++---- protocol_proxy.cpp | 4 ++-- protocol_proxy.hpp | 4 ++-- zmodule_device_manager.cpp | 4 ++-- zmodule_device_manager.hpp | 8 ++++---- zmodule_device_script_cmder_paser.cpp | 8 ++++---- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/api/zi_module.hpp b/api/zi_module.hpp index 75b7d18..26a3b5f 100644 --- a/api/zi_module.hpp +++ b/api/zi_module.hpp @@ -26,8 +26,8 @@ class ZIModule { virtual int32_t module_enable(int32_t enable) { return err::koperation_not_support; } - virtual int32_t module_set_param(int32_t param_id, int32_t param_value) { return err::koperation_not_support; } - virtual int32_t module_get_param(int32_t param_id, int32_t *param_value) { return err::koperation_not_support; } + virtual int32_t module_set_reg(int32_t param_id, int32_t param_value) { return err::koperation_not_support; } + virtual int32_t module_get_reg(int32_t param_id, int32_t *param_value) { return err::koperation_not_support; } virtual int32_t module_readio(int32_t *io) { return err::koperation_not_support; } virtual int32_t module_writeio(int32_t idindex, int32_t io) { return err::koperation_not_support; } diff --git a/cmdid.hpp b/cmdid.hpp index c01b796..7b6dfe7 100644 --- a/cmdid.hpp +++ b/cmdid.hpp @@ -15,8 +15,8 @@ typedef enum { kmodule_break = CMDID(1, 2), // para:{}, ack:{} kmodule_get_last_exec_status = CMDID(1, 3), // para:{}, ack:{4} kmodule_get_status = CMDID(1, 4), // para:{}, ack:{4} - kmodule_set_param = CMDID(1, 5), // para:{4,4}, ack:{} - kmodule_get_param = CMDID(1, 6), // para:{4}, ack:{4}I + kmodule_set_reg = CMDID(1, 5), // para:{4,4}, ack:{} + kmodule_get_reg = CMDID(1, 6), // para:{4}, ack:{4}I kmodule_readio = CMDID(1, 7), // para:{}, ack:{4} kmodule_writeio = CMDID(1, 8), // para:{4}, ack:{} kmodule_read_adc = CMDID(1, 9), // para:{4}, ack:{4} diff --git a/protocol_parser.cpp b/protocol_parser.cpp index bd6c681..0030c77 100644 --- a/protocol_parser.cpp +++ b/protocol_parser.cpp @@ -126,8 +126,8 @@ void ZIProtocolParser::onRceivePacket(zcr_cmd_header_t* rxcmd, uint8_t* data, in virtual int32_t module_get_error(int32_t *iserror) = 0; virtual int32_t module_clear_error() = 0; - virtual int32_t module_set_param(int32_t param_id, int32_t param_value) { return err::koperation_not_support; } - virtual int32_t module_get_param(int32_t param_id, int32_t *param_value) { return err::koperation_not_support; } + virtual int32_t module_set_reg(int32_t param_id, int32_t param_value) { return err::koperation_not_support; } + virtual int32_t module_get_reg(int32_t param_id, int32_t *param_value) { return err::koperation_not_support; } virtual int32_t module_readio(int32_t *io) { return err::koperation_not_support; } virtual int32_t module_writeio(int32_t io) { return err::koperation_not_support; } @@ -159,8 +159,8 @@ void ZIProtocolParser::onRceivePacket(zcr_cmd_header_t* rxcmd, uint8_t* data, in PROCESS_PACKET_00(kmodule_break, ZIModule, module_break); PROCESS_PACKET_01(kmodule_get_last_exec_status, ZIModule, module_get_last_exec_status); PROCESS_PACKET_01(kmodule_get_status, ZIModule, module_get_status); - PROCESS_PACKET_20(kmodule_set_param, ZIModule, module_set_param); - PROCESS_PACKET_11(kmodule_get_param, ZIModule, module_get_param); + PROCESS_PACKET_20(kmodule_set_reg, ZIModule, module_set_reg); + PROCESS_PACKET_11(kmodule_get_reg, ZIModule, module_get_reg); PROCESS_PACKET_01(kmodule_readio, ZIModule, module_readio); PROCESS_PACKET_20(kmodule_writeio, ZIModule, module_writeio); PROCESS_PACKET_11(kmodule_read_adc, ZIModule, module_read_adc); diff --git a/protocol_proxy.cpp b/protocol_proxy.cpp index 871fc17..515282e 100644 --- a/protocol_proxy.cpp +++ b/protocol_proxy.cpp @@ -80,8 +80,8 @@ int32_t ZIProtocolProxy::module_start() { PROXY_IMPL_00(kmodule_start, 30); } int32_t ZIProtocolProxy::module_get_last_exec_status(int32_t *ack0) { PROXY_IMPL_01(kmodule_get_last_exec_status, 30); } int32_t ZIProtocolProxy::module_get_status(int32_t *ack0) { PROXY_IMPL_01(kmodule_get_status, 30); } -int32_t ZIProtocolProxy::module_set_param(int32_t para0, int32_t para1) { PROXY_IMPL_20(kmodule_set_param, 30); } -int32_t ZIProtocolProxy::module_get_param(int32_t para0, int32_t *ack0) { PROXY_IMPL_11(kmodule_get_param, 30); } +int32_t ZIProtocolProxy::module_set_reg(int32_t para0, int32_t para1) { PROXY_IMPL_20(kmodule_set_reg, 30); } +int32_t ZIProtocolProxy::module_get_reg(int32_t para0, int32_t *ack0) { PROXY_IMPL_11(kmodule_get_reg, 30); } int32_t ZIProtocolProxy::module_readio(int32_t *ack0) { PROXY_IMPL_01(kmodule_readio, 30); } int32_t ZIProtocolProxy::module_writeio(int32_t para0, int32_t para1) { PROXY_IMPL_20(kmodule_writeio, 30); } diff --git a/protocol_proxy.hpp b/protocol_proxy.hpp index 82ab019..94f384a 100644 --- a/protocol_proxy.hpp +++ b/protocol_proxy.hpp @@ -35,8 +35,8 @@ class ZIProtocolProxy : public ZIMotor, // virtual int32_t module_get_last_exec_status(int32_t *status) override; virtual int32_t module_get_status(int32_t *status) override; - virtual int32_t module_set_param(int32_t param_id, int32_t param_value) override; - virtual int32_t module_get_param(int32_t param_id, int32_t *param_value) override; + virtual int32_t module_set_reg(int32_t param_id, int32_t param_value) override; + virtual int32_t module_get_reg(int32_t param_id, int32_t *param_value) override; virtual int32_t module_readio(int32_t *io) override; virtual int32_t module_writeio(int32_t ioindex, int32_t io) override; diff --git a/zmodule_device_manager.cpp b/zmodule_device_manager.cpp index 95d382c..ec0aba7 100644 --- a/zmodule_device_manager.cpp +++ b/zmodule_device_manager.cpp @@ -32,8 +32,8 @@ int32_t ZModuleDeviceManager::module_stop(uint16_t id) { PROXY_IMPL(ZIModule, mo int32_t ZModuleDeviceManager::module_break(uint16_t id) { PROXY_IMPL(ZIModule, module_break); } int32_t ZModuleDeviceManager::module_get_last_exec_status(uint16_t id, int32_t *ack0) { PROXY_IMPL(ZIModule, module_get_last_exec_status, ack0); } int32_t ZModuleDeviceManager::module_get_status(uint16_t id, int32_t *status) { PROXY_IMPL(ZIModule, module_get_status, status); } -int32_t ZModuleDeviceManager::module_set_param(uint16_t id, int32_t param_id, int32_t param_value) { PROXY_IMPL(ZIModule, module_set_param, param_id, param_value); } -int32_t ZModuleDeviceManager::module_get_param(uint16_t id, int32_t param_id, int32_t *param_value) { PROXY_IMPL(ZIModule, module_get_param, param_id, param_value); } +int32_t ZModuleDeviceManager::module_set_reg(uint16_t id, int32_t param_id, int32_t param_value) { PROXY_IMPL(ZIModule, module_set_reg, param_id, param_value); } +int32_t ZModuleDeviceManager::module_get_reg(uint16_t id, int32_t param_id, int32_t *param_value) { PROXY_IMPL(ZIModule, module_get_reg, param_id, param_value); } int32_t ZModuleDeviceManager::module_readio(uint16_t id, int32_t *io) { PROXY_IMPL(ZIModule, module_readio, io); } int32_t ZModuleDeviceManager::module_writeio(uint16_t id, int32_t ioindex, int32_t io) { PROXY_IMPL(ZIModule, module_writeio, ioindex, io); } int32_t ZModuleDeviceManager::module_read_adc(uint16_t id, int32_t adcindex, int32_t *adc) { PROXY_IMPL(ZIModule, module_read_adc, adcindex, adc); } diff --git a/zmodule_device_manager.hpp b/zmodule_device_manager.hpp index 60b0f97..784cf91 100644 --- a/zmodule_device_manager.hpp +++ b/zmodule_device_manager.hpp @@ -30,8 +30,8 @@ class ZModuleDeviceManager { virtual int32_t module_get_error(int32_t *iserror) = 0; virtual int32_t module_clear_error() = 0; - virtual int32_t module_set_param(int32_t param_id, int32_t param_value) { return err::koperation_not_support; } - virtual int32_t module_get_param(int32_t param_id, int32_t *param_value) { return err::koperation_not_support; } + virtual int32_t module_set_reg(int32_t param_id, int32_t param_value) { return err::koperation_not_support; } + virtual int32_t module_get_reg(int32_t param_id, int32_t *param_value) { return err::koperation_not_support; } virtual int32_t module_readio(int32_t *io) { return err::koperation_not_support; } virtual int32_t module_writeio(int32_t io) { return err::koperation_not_support; } @@ -62,8 +62,8 @@ class ZModuleDeviceManager { virtual int32_t module_get_last_exec_status(uint16_t id, int32_t *status); virtual int32_t module_get_status(uint16_t id, int32_t *status); - virtual int32_t module_set_param(uint16_t id, int32_t param_id, int32_t param_value); - virtual int32_t module_get_param(uint16_t id, int32_t param_id, int32_t *param_value); + virtual int32_t module_set_reg(uint16_t id, int32_t param_id, int32_t param_value); + virtual int32_t module_get_reg(uint16_t id, int32_t param_id, int32_t *param_value); virtual int32_t module_readio(uint16_t id, int32_t *io); virtual int32_t module_writeio(uint16_t id, int32_t ioindex, int32_t io); diff --git a/zmodule_device_script_cmder_paser.cpp b/zmodule_device_script_cmder_paser.cpp index 6cf564e..b452a2c 100644 --- a/zmodule_device_script_cmder_paser.cpp +++ b/zmodule_device_script_cmder_paser.cpp @@ -56,8 +56,8 @@ void ZModuleDeviceScriptCmderPaser::initialize(ICmdParser* cancmder, ZModuleDevi int32_t module_get_last_exec_status(uint16_t id, int32_t *status); int32_t module_get_status(uint16_t id, int32_t *status); - int32_t module_set_param(uint16_t id, int32_t param_id, int32_t param_value); - int32_t module_get_param(uint16_t id, int32_t param_id, int32_t *param_value); + int32_t module_set_reg(uint16_t id, int32_t param_id, int32_t param_value); + int32_t module_get_reg(uint16_t id, int32_t param_id, int32_t *param_value); int32_t module_readio(uint16_t id, int32_t *io); int32_t module_writeio(uint16_t id, int32_t io); @@ -102,8 +102,8 @@ void ZModuleDeviceScriptCmderPaser::initialize(ICmdParser* cancmder, ZModuleDevi PROCESS_PACKET_10(module_break, "(mid)"); PROCESS_PACKET_11(module_get_last_exec_status, "(mid)"); PROCESS_PACKET_11(module_get_status, "(mid)"); - PROCESS_PACKET_30(module_set_param, "(mid, param_id, param_value)"); - PROCESS_PACKET_21(module_get_param, "(mid, param_id)"); + PROCESS_PACKET_30(module_set_reg, "(mid, param_id, param_value)"); + PROCESS_PACKET_21(module_get_reg, "(mid, param_id)"); PROCESS_PACKET_11(module_readio, "(mid)"); PROCESS_PACKET_30(module_writeio, "(mid,ioindex,io)"); PROCESS_PACKET_21(module_read_adc, "(mid,adc_id, adcindex)");