Browse Source

fix some compile error

change_pipette_api
zhaohe 2 years ago
parent
commit
0800663754
  1. 4
      protocol_proxy.hpp
  2. 4
      zmodule_device_manager.hpp

4
protocol_proxy.hpp

@ -2,7 +2,7 @@
#include <map>
#include "api/api.hpp"
#include "api\i_zcan_cmder_master.hpp"
#include "api/i_zcan_cmder_master.hpp"
#include "cmdid.hpp"
namespace iflytop {
@ -81,7 +81,7 @@ class ZIProtocolProxy : public ZIMotor, //
virtual int32_t motor_move_to_zero_backward_and_calculated_shift(int32_t findzerospeed, int32_t findzeroedge_speed, int32_t acc, int32_t overtime) { return err::koperation_not_support; }
virtual int32_t motor_read_pos(int32_t* pos) { return err::koperation_not_support; }
virtual int32_t motor_set_current_pos_by_change_shift(int32_t pos) { return err::koperation_not_support; } // Ò»°ãÓÃÓÚ¶æ»ú
virtual int32_t motor_set_current_pos_by_change_shift(int32_t pos) { return err::koperation_not_support; } // һ�����ڶ��
virtual int32_t motor_calculated_pos_by_move_to_zero() { return err::koperation_not_support; }
#endif

4
zmodule_device_manager.hpp

@ -3,7 +3,7 @@
#include <map>
#include "api/api.hpp"
#include "api\i_zcan_cmder_master.hpp"
#include "api/i_zcan_cmder_master.hpp"
#include "cmdid.hpp"
namespace iflytop {
@ -121,7 +121,7 @@ class ZModuleDeviceManager {
virtual int32_t motor_move_to_zero_backward_and_calculated_shift(int32_t findzerospeed, int32_t findzeroedge_speed, int32_t acc, int32_t overtime) { return err::koperation_not_support; }
virtual int32_t motor_read_pos(int32_t* pos) { return err::koperation_not_support; }
virtual int32_t motor_set_current_pos_by_change_shift(int32_t pos) { return err::koperation_not_support; } // Ò»°ãÓÃÓÚ¶æ»ú
virtual int32_t motor_set_current_pos_by_change_shift(int32_t pos) { return err::koperation_not_support; } // һ�����ڶ��
virtual int32_t motor_calculated_pos_by_move_to_zero() { return err::koperation_not_support; }
#endif

Loading…
Cancel
Save