|
|
@ -61,7 +61,7 @@ int32_t MiniRobotCtrlModule::rotate(s32 speed, s32 torque, s32 run_time, action_ |
|
|
|
if (m_thread.getExitFlag() && run_time != 0) break; |
|
|
|
if (m_thread.getExitFlag() && run_time == 0) break; |
|
|
|
|
|
|
|
if (run_time != 0 && zos_haspassedms(entertime) > run_time) { |
|
|
|
if (run_time != 0 && (zos_haspassedms(entertime) > (uint32_t)run_time)) { |
|
|
|
stop(0); |
|
|
|
call_status_cb(status_cb, 0); |
|
|
|
break; |
|
|
@ -363,7 +363,7 @@ int32_t MiniRobotCtrlModule::motor_move_to_torque(int32_t targetpos, int32_t tor |
|
|
|
while (true) { |
|
|
|
if (m_thread.getExitFlag()) break; |
|
|
|
|
|
|
|
if (overtime != 0 && zos_haspassedms(entertime) > overtime) { |
|
|
|
if (overtime != 0 && zos_haspassedms(entertime) > (uint32_t)overtime) { |
|
|
|
ZLOGI(TAG, "%d motor_move_to_torque %d overtime", m_module_id, m_id); |
|
|
|
stop(0); |
|
|
|
set_errorcode(err::kmotor_run_overtime); |
|
|
@ -397,4 +397,4 @@ int32_t MiniRobotCtrlModule::motor_move_to_zero_backward(int32_t findzerospeed, |
|
|
|
int32_t MiniRobotCtrlModule::motor_read_pos(int32_t *pos) { |
|
|
|
if (!m_bus->getNowPos(m_id, *pos)) return err::ksubdevice_overtime; |
|
|
|
return 0; |
|
|
|
} |
|
|
|
} |