|
|
@@ -326,7 +326,7 @@ uint8_t ctr_clear(uint16_t status_clear)
|
|
|
rt_free(Clear_ERR);
|
|
|
rt_pin_write(CLEAR_R,OFF);
|
|
|
rt_pin_write(CLEAR_L,OFF);
|
|
|
- break;
|
|
|
+ return 0;
|
|
|
}
|
|
|
clear_num = 0;
|
|
|
rt_thread_delay(1000);
|
|
|
@@ -360,17 +360,17 @@ void ctr_TG_Clear(uint16_t clear_timeout)
|
|
|
{
|
|
|
rt_pin_write(CLEAR_R,ON);
|
|
|
rt_pin_write(CLEAR_L,OFF);
|
|
|
- clear_timeout--;
|
|
|
+ clear_count--;
|
|
|
rt_thread_delay(100);
|
|
|
}
|
|
|
rt_pin_write(CLEAR_R,OFF);
|
|
|
rt_pin_write(CLEAR_L,OFF);
|
|
|
rt_thread_delay(2000);
|
|
|
- while(clear_timeout!=clear_timeout)
|
|
|
+ while(clear_timeout!=clear_count)
|
|
|
{
|
|
|
rt_pin_write(CLEAR_R,OFF);
|
|
|
rt_pin_write(CLEAR_L,ON);
|
|
|
- clear_timeout++;
|
|
|
+ clear_count++;
|
|
|
rt_thread_delay(100);
|
|
|
}
|
|
|
rt_pin_write(CLEAR_R,OFF);
|
|
|
@@ -1247,11 +1247,11 @@ void WorkTast(void)
|
|
|
rt_thread_delay(1000);
|
|
|
//关闭下仓门
|
|
|
device_status.ctr_down_motor = 2;
|
|
|
-// while(device_status.ctr_down_motor!=0)
|
|
|
-// {
|
|
|
-// rt_thread_delay(100);
|
|
|
-// rt_kprintf("等待下仓门关闭!!!\n");
|
|
|
-// }
|
|
|
+ while(device_status.ctr_down_motor!=0)
|
|
|
+ {
|
|
|
+ rt_thread_delay(100);
|
|
|
+ rt_kprintf("等待下仓门关闭!!!\n");
|
|
|
+ }
|
|
|
if(device_status.version_type==4)
|
|
|
{
|
|
|
//震动
|