|
@ -285,20 +285,20 @@ int32_t StepMotorCtrlModule::exec_move_to_io_task(int32_t ioindex, int32_t direc |
|
|
vTaskDelay(1); |
|
|
vTaskDelay(1); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// 等待电机停止
|
|
|
|
|
|
|
|
|
// 绛夊緟鐢垫満鍋滄�
|
|
|
while (!m_stepM1->isStoped() && !m_thread.getExitFlag()) { |
|
|
while (!m_stepM1->isStoped() && !m_thread.getExitFlag()) { |
|
|
m_stepM1->stop(); |
|
|
m_stepM1->stop(); |
|
|
vTaskDelay(100); |
|
|
vTaskDelay(100); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// 失败返回
|
|
|
|
|
|
|
|
|
// 澶辫触杩斿洖
|
|
|
if (!xreach_io) { |
|
|
if (!xreach_io) { |
|
|
ZLOGE(TAG, "x reach io failed"); |
|
|
ZLOGE(TAG, "x reach io failed"); |
|
|
return err::kxymotor_not_found_x_zero_point; |
|
|
return err::kxymotor_not_found_x_zero_point; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// 如果设备已经在零点,则反向移动一定距离远离零点
|
|
|
|
|
|
|
|
|
// 濡傛灉璁惧�宸茬粡鍦ㄩ浂鐐癸紝鍒欏弽鍚戠Щ鍔ㄤ竴瀹氳窛绂昏繙绂婚浂鐐�
|
|
|
if (gpio->getState()) { |
|
|
if (gpio->getState()) { |
|
|
ZLOGI(TAG, "---------STEP2-------- find edge"); |
|
|
ZLOGI(TAG, "---------STEP2-------- find edge"); |
|
|
_rotate(-direction * lookPointVelocity, lookPointDec, lookPointDec); |
|
|
_rotate(-direction * lookPointVelocity, lookPointDec, lookPointDec); |
|
@ -313,7 +313,7 @@ int32_t StepMotorCtrlModule::exec_move_to_io_task(int32_t ioindex, int32_t direc |
|
|
vTaskDelay(1); |
|
|
vTaskDelay(1); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
while (!m_stepM1->isStoped() && !m_thread.getExitFlag()) { // 等待电机停止
|
|
|
|
|
|
|
|
|
while (!m_stepM1->isStoped() && !m_thread.getExitFlag()) { // 绛夊緟鐢垫満鍋滄�
|
|
|
m_stepM1->stop(); |
|
|
m_stepM1->stop(); |
|
|
vTaskDelay(100); |
|
|
vTaskDelay(100); |
|
|
} |
|
|
} |
|
|