project_boditech_vidas_a8000_v3
/
a8000_subboard_sdk
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

master
zhaohe 2 years ago
parent
8e28cd2158
commit
1d10712855
12 changed files with 22 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      components/eq_20_asb_motor/eq20_servomotor.cpp
  2. 4
      components/eq_20_asb_motor/eq20_servomotor.hpp
  3. 4
      components/mini_servo_motor/mini_servo_motor_ctrl_module.cpp
  4. 4
      components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp
  5. 4
      components/step_motor_45/step_motor_45.cpp
  6. 4
      components/step_motor_45/step_motor_45.hpp
  7. 4
      components/step_motor_ctrl_module/step_motor_ctrl_module.cpp
  8. 4
      components/step_motor_ctrl_module/step_motor_ctrl_module.hpp
  9. 4
      components/xy_robot_ctrl_module/xy_robot_ctrl_module.cpp
  10. 4
      components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp
  11. 2
      components/zprotocol_helper/micro_computer_module_device_script_cmder_paser.cpp
  12. 2
      components/zprotocols/zcancmder_v2

4
components/eq_20_asb_motor/eq20_servomotor.cpp
View File

@ -272,8 +272,8 @@ int32_t Eq20ServoMotor::module_get_error(int32_t *iserror) {
return 0;
}
int32_t Eq20ServoMotor::module_clear_error() { return err::koperation_not_support; }
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_set_reg(int32_t param_id, int32_t param_value) { return err::koperation_not_support; }
int32_t Eq20ServoMotor::module_get_reg(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_read_adc(int32_t adcindex, int32_t *adc) { return err::koperation_not_support; }
int32_t Eq20ServoMotor::motor_enable(int32_t varenable) { return enable(varenable); }

4
components/eq_20_asb_motor/eq20_servomotor.hpp
View File

@ -112,8 +112,8 @@ class Eq20ServoMotor : public ZIModule, public ZIMotor {
virtual int32_t module_get_error(int32_t *iserror) override;
virtual int32_t module_clear_error() 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;

4
components/mini_servo_motor/mini_servo_motor_ctrl_module.cpp
View File

@ -313,8 +313,8 @@ int32_t MiniRobotCtrlModule::module_clear_error() {
return 0;
}
int32_t MiniRobotCtrlModule::module_set_param(int32_t param_id, int32_t param_value) { return err::kmodule_not_find_config_index; }
int32_t MiniRobotCtrlModule::module_get_param(int32_t param_id, int32_t *param_value) { return err::kmodule_not_find_config_index; }
int32_t MiniRobotCtrlModule::module_set_reg(int32_t param_id, int32_t param_value) { return err::kmodule_not_find_config_index; }
int32_t MiniRobotCtrlModule::module_get_reg(int32_t param_id, int32_t *param_value) { return err::kmodule_not_find_config_index; }
int32_t MiniRobotCtrlModule::module_readio(int32_t *io) {
*io = 0;
return 0;

4
components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp
View File

@ -54,8 +54,8 @@ class MiniRobotCtrlModule : public I_MiniServoModule, public ZIModule, public ZI
virtual int32_t module_get_error(int32_t *iserror) override;
virtual int32_t module_clear_error() 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;

4
components/step_motor_45/step_motor_45.cpp
View File

@ -318,8 +318,8 @@ int32_t StepMotor45::module_get_error(int32_t *iserror) {
}
int32_t StepMotor45::module_clear_error() { return (int32_t)0; }
int32_t StepMotor45::module_set_param(int32_t param_id, int32_t param_value) { return err::kmodule_not_find_config_index; }
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_set_reg(int32_t param_id, int32_t param_value) { return err::kmodule_not_find_config_index; }
int32_t StepMotor45::module_get_reg(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_read_adc(int32_t adcindex, int32_t *adc) { return (int32_t)0; }

4
components/step_motor_45/step_motor_45.hpp
View File

@ -109,8 +109,8 @@ class StepMotor45 : public ZIModule, public ZIMotor {
virtual int32_t module_get_error(int32_t *iserror) override;
virtual int32_t module_clear_error() 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;

4
components/step_motor_ctrl_module/step_motor_ctrl_module.cpp
View File

@ -662,7 +662,7 @@ int32_t StepMotorCtrlModule::module_get_error(int32_t* iserror) {
*val = modulereg; \
break;
int32_t StepMotorCtrlModule::module_set_param(int32_t param_id, int32_t val) {
int32_t StepMotorCtrlModule::module_set_reg(int32_t param_id, int32_t val) {
switch (param_id) {
SET_REG(kreg_motor_x_shift, m_param.shift_x);
SET_REG(kreg_motor_x_shaft, m_param.x_shaft);
@ -685,7 +685,7 @@ int32_t StepMotorCtrlModule::module_set_param(int32_t param_id, int32_t val) {
}
return 0;
}
int32_t StepMotorCtrlModule::module_get_param(int32_t param_id, int32_t* val) {
int32_t StepMotorCtrlModule::module_get_reg(int32_t param_id, int32_t* val) {
int32_t nowpos = 0;
read_pos(nowpos);

4
components/step_motor_ctrl_module/step_motor_ctrl_module.hpp
View File

@ -121,8 +121,8 @@ class StepMotorCtrlModule : public I_StepMotorCtrlModule, public ZIModule, publi
virtual int32_t module_get_error(int32_t* iserror) override;
virtual int32_t module_clear_error() 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;

4
components/xy_robot_ctrl_module/xy_robot_ctrl_module.cpp
View File

@ -641,7 +641,7 @@ int32_t XYRobotCtrlModule::module_clear_error() { return 0; }
*val = modulereg; \
break;
int32_t XYRobotCtrlModule::module_set_param(int32_t param_id, int32_t val) {
int32_t XYRobotCtrlModule::module_set_reg(int32_t param_id, int32_t val) {
switch (param_id) {
SET_REG(kreg_motor_x_shift, m_basecfg.shift_x);
SET_REG(kreg_motor_y_shift, m_basecfg.shift_y);
@ -669,7 +669,7 @@ int32_t XYRobotCtrlModule::module_set_param(int32_t param_id, int32_t val) {
return err::kmodule_not_find_config_index;
}
}
int32_t XYRobotCtrlModule::module_get_param(int32_t param_id, int32_t* val) {
int32_t XYRobotCtrlModule::module_get_reg(int32_t param_id, int32_t* val) {
switch (param_id) {
GET_REG(kreg_motor_x_shift, m_basecfg.shift_x);
GET_REG(kreg_motor_y_shift, m_basecfg.shift_y);

4
components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp
View File

@ -89,8 +89,8 @@ class XYRobotCtrlModule : public I_XYRobotCtrlModule, public ZIXYMotor, public Z
virtual int32_t module_get_status(int32_t* status);
virtual int32_t module_get_error(int32_t* iserror);
virtual int32_t module_clear_error();
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_set_reg(int32_t param_id, int32_t param_value);
virtual int32_t module_get_reg(int32_t param_id, int32_t* param_value);
virtual int32_t module_readio(int32_t* io);
virtual int32_t module_read_adc(int32_t adcindex, int32_t* adc);
virtual int32_t module_factory_reset();

2
components/zprotocol_helper/micro_computer_module_device_script_cmder_paser.cpp
View File

@ -28,7 +28,7 @@ void MicroComputerModuleDeviceScriptCmderPaser::do_dumpreg(int32_t paramN, const
ZLOGI(TAG, "dumpconfig %s", paraV[0]);
#define DUMP_CONFIG(tag, configid) \
ecode = m_deviceManager->module_get_param(moduleId, configid, &configval); \
ecode = m_deviceManager->module_get_reg(moduleId, configid, &configval); \
if (ecode == 0) { \
ZLOGI(TAG, "%-30s :%d", tag, configval); \
}

2
components/zprotocols/zcancmder_v2

@ -1 +1 @@
Subproject commit acab0c3069ef75c7462a875592fe6a4eaf72c964
Subproject commit eff87241aaf65b433aab96b0d8a7ce0261c4d9dc
Write Preview
Loading…
Cancel
Save