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

udpate

master
zhaohe 2 years ago
parent
c664738f2d
commit
3ff49db3ce
11 changed files with 3 additions and 11 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. 1
      components/eq_20_asb_motor/eq20_servomotor.cpp
  2. 2
      components/eq_20_asb_motor/eq20_servomotor.hpp
  3. 1
      components/mini_servo_motor/mini_servo_motor_ctrl_module.cpp
  4. 1
      components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp
  5. 1
      components/step_motor_45/step_motor_45.cpp
  6. 1
      components/step_motor_45/step_motor_45.hpp
  7. 1
      components/step_motor_ctrl_module/step_motor_ctrl_module.cpp
  8. 1
      components/step_motor_ctrl_module/step_motor_ctrl_module.hpp
  9. 2
      components/xy_robot_ctrl_module/xy_robot_ctrl_module.cpp
  10. 1
      components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp
  11. 2
      components/zprotocols/zcancmder_v2

1
components/eq_20_asb_motor/eq20_servomotor.cpp
View File

@ -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; }

2
components/eq_20_asb_motor/eq20_servomotor.hpp
View File

@ -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;

1
components/mini_servo_motor/mini_servo_motor_ctrl_module.cpp
View File

@ -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;

1
components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp
View File

@ -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;

1
components/step_motor_45/step_motor_45.cpp
View File

@ -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; }
/*******************************************************************************

1
components/step_motor_45/step_motor_45.hpp
View File

@ -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;

1
components/step_motor_ctrl_module/step_motor_ctrl_module.cpp
View File

@ -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;

1
components/step_motor_ctrl_module/step_motor_ctrl_module.hpp
View File

@ -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;

2
components/xy_robot_ctrl_module/xy_robot_ctrl_module.cpp
View File

@ -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;

1
components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp
View File

@ -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();

2
components/zprotocols/zcancmder_v2

@ -1 +1 @@
Subproject commit 4aed09f7ae4d1a12628abf0ef81e6a3ae88909c2
Subproject commit 7f12da5d4065294badfb3f970ba6dc539eb6a7b8
Write Preview
Loading…
Cancel
Save