Browse Source

update

master
zhaohe 2 years ago
parent
commit
fbe10eeb6c
  1. 4
      components/mini_servo_motor/mini_servo_motor_ctrl_module.cpp
  2. 9
      components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp
  3. 2
      components/zprotocols/zcancmder_v2

4
components/mini_servo_motor/mini_servo_motor_ctrl_module.cpp

@ -428,4 +428,6 @@ int32_t MiniRobotCtrlModule::motor_easy_rotate(int32_t direction) {
} }
int32_t MiniRobotCtrlModule::motor_easy_move_by(int32_t distance) { return move_by(distance, 0, m_cfg.default_torque, nullptr); } int32_t MiniRobotCtrlModule::motor_easy_move_by(int32_t distance) { return move_by(distance, 0, m_cfg.default_torque, nullptr); }
int32_t MiniRobotCtrlModule::motor_easy_move_to(int32_t position) { return move_to(position, 0, m_cfg.default_torque, nullptr); } int32_t MiniRobotCtrlModule::motor_easy_move_to(int32_t position) { return move_to(position, 0, m_cfg.default_torque, nullptr); }
int32_t MiniRobotCtrlModule::motor_easy_move_to_zero(int32_t direction) { return motor_easy_move_to(0); }
int32_t MiniRobotCtrlModule::motor_easy_move_to_zero(int32_t direction) { return motor_easy_move_to(0); }
int32_t MiniRobotCtrlModule::motor_easy_set_current_pos(int32_t pos) { return position_calibrate(pos); }

9
components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp

@ -90,10 +90,11 @@ class MiniRobotCtrlModule : public I_MiniServoModule, public ZIModule, public ZI
virtual int32_t motor_read_pos(int32_t *pos); virtual int32_t motor_read_pos(int32_t *pos);
virtual int32_t motor_easy_rotate(int32_t direction);
virtual int32_t motor_easy_move_by(int32_t distance);
virtual int32_t motor_easy_move_to(int32_t position);
virtual int32_t motor_easy_move_to_zero(int32_t direction);
virtual int32_t motor_easy_rotate(int32_t direction) override;
virtual int32_t motor_easy_move_by(int32_t distance) override;
virtual int32_t motor_easy_move_to(int32_t position) override;
virtual int32_t motor_easy_move_to_zero(int32_t direction) override;
virtual int32_t motor_easy_set_current_pos(int32_t pos) override;
private: private:
void call_status_cb(action_cb_status_t cb, int32_t status); void call_status_cb(action_cb_status_t cb, int32_t status);

2
components/zprotocols/zcancmder_v2

@ -1 +1 @@
Subproject commit 7ccc1333efb292c976ce5f589bb1f9499987b6f2
Subproject commit f20a0f5affb28e0f4ae6c6dddfea7c54b493fe54
Loading…
Cancel
Save