|
|
@@ -1396,7 +1396,7 @@ void ResetInit(void)
|
|
|
|
|
|
if(device_status.version_type==4||device_status.version_type==41)
|
|
|
{
|
|
|
- device_status.clear_status=1;
|
|
|
+ if(device_status.photo_ws==0) device_status.clear_status=1;
|
|
|
while(device_status.clear_status==1){
|
|
|
rt_thread_delay(1000);
|
|
|
}
|
|
|
@@ -1966,6 +1966,7 @@ void WorkTask(void)
|
|
|
rt_thread_delay(50);
|
|
|
}
|
|
|
ctr_cangmen_down(OFF);
|
|
|
+ rt_thread_delay(1000);
|
|
|
#endif
|
|
|
|
|
|
if(device_status.version_type==4||device_status.version_type==41)
|
|
|
@@ -1998,6 +1999,12 @@ void WorkTask(void)
|
|
|
device_status.photo_ws = 1;
|
|
|
//关闭下仓门
|
|
|
device_status.ctr_down_motor = 2;
|
|
|
+ //待下仓门完全关闭
|
|
|
+ while(device_status.ctr_down_motor!=0)
|
|
|
+ {
|
|
|
+ rt_thread_delay(100);
|
|
|
+ rt_kprintf("等待下仓门关闭!!!\n");
|
|
|
+ }
|
|
|
device_status.ctr_up_motor = 1; //打开上仓门
|
|
|
#endif
|
|
|
}
|