From 3ff49db3ceebb2d666de5e233701bdae41aa39d4 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Fri, 27 Oct 2023 21:37:06 +0800 Subject: [PATCH] udpate --- components/eq_20_asb_motor/eq20_servomotor.cpp | 1 - components/eq_20_asb_motor/eq20_servomotor.hpp | 2 +- components/mini_servo_motor/mini_servo_motor_ctrl_module.cpp | 1 - components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp | 1 - components/step_motor_45/step_motor_45.cpp | 1 - components/step_motor_45/step_motor_45.hpp | 1 - components/step_motor_ctrl_module/step_motor_ctrl_module.cpp | 1 - components/step_motor_ctrl_module/step_motor_ctrl_module.hpp | 1 - components/xy_robot_ctrl_module/xy_robot_ctrl_module.cpp | 2 +- components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp | 1 - components/zprotocols/zcancmder_v2 | 2 +- 11 files changed, 3 insertions(+), 11 deletions(-) diff --git a/components/eq_20_asb_motor/eq20_servomotor.cpp b/components/eq_20_asb_motor/eq20_servomotor.cpp index 9b681f2..d78d479 100644 --- a/components/eq_20_asb_motor/eq20_servomotor.cpp +++ b/components/eq_20_asb_motor/eq20_servomotor.cpp @@ -275,7 +275,6 @@ int32_t Eq20ServoMotor::module_clear_error() { return err::koperation_not_suppor int32_t Eq20ServoMotor::module_set_param(int32_t param_id, int32_t param_value) { return err::koperation_not_support; } int32_t Eq20ServoMotor::module_get_param(int32_t param_id, int32_t *param_value) { return err::koperation_not_support; } int32_t Eq20ServoMotor::module_readio(int32_t *io) { return get_io_state(*io); } -int32_t Eq20ServoMotor::module_writeio(int32_t io) { return err::koperation_not_support; } int32_t Eq20ServoMotor::module_read_adc(int32_t adcindex, int32_t *adc) { return err::koperation_not_support; } int32_t Eq20ServoMotor::motor_enable(int32_t varenable) { return enable(varenable); } int32_t Eq20ServoMotor::motor_rotate(int32_t direction, int32_t motor_velocity, int32_t acc) { return err::koperation_not_support; } diff --git a/components/eq_20_asb_motor/eq20_servomotor.hpp b/components/eq_20_asb_motor/eq20_servomotor.hpp index 3ce662a..a2ecc31 100644 --- a/components/eq_20_asb_motor/eq20_servomotor.hpp +++ b/components/eq_20_asb_motor/eq20_servomotor.hpp @@ -116,7 +116,7 @@ class Eq20ServoMotor : public ZIModule, public ZIMotor { virtual int32_t module_get_param(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 io) override; + virtual int32_t module_read_adc(int32_t adcindex, int32_t *adc) override; diff --git a/components/mini_servo_motor/mini_servo_motor_ctrl_module.cpp b/components/mini_servo_motor/mini_servo_motor_ctrl_module.cpp index a68296e..845614c 100644 --- a/components/mini_servo_motor/mini_servo_motor_ctrl_module.cpp +++ b/components/mini_servo_motor/mini_servo_motor_ctrl_module.cpp @@ -319,7 +319,6 @@ int32_t MiniRobotCtrlModule::module_readio(int32_t *io) { *io = 0; return 0; } -int32_t MiniRobotCtrlModule::module_writeio(int32_t io) { return 0; } int32_t MiniRobotCtrlModule::module_read_adc(int32_t adcindex, int32_t *adc) { *adc = 0; return 0; diff --git a/components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp b/components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp index 36e14e1..d19e5af 100644 --- a/components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp +++ b/components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp @@ -58,7 +58,6 @@ class MiniRobotCtrlModule : public I_MiniServoModule, public ZIModule, public ZI virtual int32_t module_get_param(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 io) override; virtual int32_t module_read_adc(int32_t adcindex, int32_t *adc) override; diff --git a/components/step_motor_45/step_motor_45.cpp b/components/step_motor_45/step_motor_45.cpp index 2d817be..0c2345c 100644 --- a/components/step_motor_45/step_motor_45.cpp +++ b/components/step_motor_45/step_motor_45.cpp @@ -322,7 +322,6 @@ int32_t StepMotor45::module_set_param(int32_t param_id, int32_t param_value) { r int32_t StepMotor45::module_get_param(int32_t param_id, int32_t *param_value) { return err::kmodule_not_find_config_index; } int32_t StepMotor45::module_readio(int32_t *io) { return (int32_t)0; } -int32_t StepMotor45::module_writeio(int32_t io) { return (int32_t)0; } int32_t StepMotor45::module_read_adc(int32_t adcindex, int32_t *adc) { return (int32_t)0; } /******************************************************************************* diff --git a/components/step_motor_45/step_motor_45.hpp b/components/step_motor_45/step_motor_45.hpp index 219f46b..72c82e2 100644 --- a/components/step_motor_45/step_motor_45.hpp +++ b/components/step_motor_45/step_motor_45.hpp @@ -113,7 +113,6 @@ class StepMotor45 : public ZIModule, public ZIMotor { virtual int32_t module_get_param(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 io) override; virtual int32_t module_read_adc(int32_t adcindex, int32_t *adc) override; diff --git a/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp b/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp index a083744..006a06c 100644 --- a/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp +++ b/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp @@ -701,7 +701,6 @@ int32_t StepMotorCtrlModule::module_readio(int32_t* io) { } return 0; } -int32_t StepMotorCtrlModule::module_writeio(int32_t io) { return 0; } int32_t StepMotorCtrlModule::module_read_adc(int32_t adcindex, int32_t* adc) { *adc = 0; diff --git a/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp b/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp index d2f8deb..be92963 100644 --- a/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp +++ b/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp @@ -116,7 +116,6 @@ class StepMotorCtrlModule : public I_StepMotorCtrlModule, public ZIModule, publi int32_t _module_set_or_get_param(bool set, int32_t param_id, int32_t& param_value); virtual int32_t module_readio(int32_t* io) override; - virtual int32_t module_writeio(int32_t io) override; virtual int32_t module_read_adc(int32_t adcindex, int32_t* adc) override; diff --git a/components/xy_robot_ctrl_module/xy_robot_ctrl_module.cpp b/components/xy_robot_ctrl_module/xy_robot_ctrl_module.cpp index 2dd6bf2..2d75746 100644 --- a/components/xy_robot_ctrl_module/xy_robot_ctrl_module.cpp +++ b/components/xy_robot_ctrl_module/xy_robot_ctrl_module.cpp @@ -715,7 +715,7 @@ int32_t XYRobotCtrlModule::module_readio(int32_t* io) { } return 0; } -int32_t XYRobotCtrlModule::module_writeio(int32_t io) { return 0; } + int32_t XYRobotCtrlModule::module_read_adc(int32_t adcindex, int32_t* adc) { *adc = 0; return 0; diff --git a/components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp b/components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp index a993fe9..df32c40 100644 --- a/components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp +++ b/components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp @@ -84,7 +84,6 @@ class XYRobotCtrlModule : public I_XYRobotCtrlModule, public ZIXYMotor, public Z virtual int32_t module_set_param(int32_t param_id, int32_t param_value); virtual int32_t module_get_param(int32_t param_id, int32_t* param_value); virtual int32_t module_readio(int32_t* io); - virtual int32_t module_writeio(int32_t io); virtual int32_t module_read_adc(int32_t adcindex, int32_t* adc); virtual int32_t module_factory_reset(); virtual int32_t module_flush_cfg(); diff --git a/components/zprotocols/zcancmder_v2 b/components/zprotocols/zcancmder_v2 index 4aed09f..7f12da5 160000 --- a/components/zprotocols/zcancmder_v2 +++ b/components/zprotocols/zcancmder_v2 @@ -1 +1 @@ -Subproject commit 4aed09f7ae4d1a12628abf0ef81e6a3ae88909c2 +Subproject commit 7f12da5d4065294badfb3f970ba6dc539eb6a7b8