|
|
@@ -65,6 +65,7 @@ uint8_t ctr_Fan_IN(uint8_t status_ws)
|
|
|
}
|
|
|
/****************************定制色诱*************************************/
|
|
|
/**/
|
|
|
+#if Color_EN == 1
|
|
|
uint8_t Read_Color_Key(rt_base_t key_pin)
|
|
|
{
|
|
|
rt_uint32_t sta_s = 0;
|
|
|
@@ -99,19 +100,19 @@ int ctr_Color_board(uint8_t forward,uint16_t time_board)
|
|
|
{
|
|
|
if(forward==CLOSE) //归位
|
|
|
{
|
|
|
- if(device_status.cul_time>7) device_status.cul_time=7;
|
|
|
- if(device_status.cul_time!=7)
|
|
|
- {
|
|
|
- uint8_t ct = device_status.cul_time;
|
|
|
- while(1)
|
|
|
- {
|
|
|
- Beep_Tip(100);
|
|
|
- rt_thread_delay(100);
|
|
|
- ct--;
|
|
|
- if(ct==0) break;
|
|
|
- }
|
|
|
- //return device_status.cul_time;
|
|
|
- }
|
|
|
+// if(device_status.cul_time>7) device_status.cul_time=7;
|
|
|
+// if(device_status.cul_time!=7)
|
|
|
+// {
|
|
|
+// uint8_t ct = device_status.cul_time;
|
|
|
+// while(1)
|
|
|
+// {
|
|
|
+// Beep_Tip(100);
|
|
|
+// rt_thread_delay(100);
|
|
|
+// ct--;
|
|
|
+// if(ct==0) break;
|
|
|
+// }
|
|
|
+// //return device_status.cul_time;
|
|
|
+// }
|
|
|
if(Read_Color_Limit(LIMIT_RESET)==0)
|
|
|
{
|
|
|
LOG_W("已在初始位置!");
|
|
|
@@ -122,12 +123,12 @@ int ctr_Color_board(uint8_t forward,uint16_t time_board)
|
|
|
ctr_cangmen_up(CLOSE);
|
|
|
rt_thread_delay(10000);
|
|
|
ctr_cangmen_up(OFF);
|
|
|
- if(device_status.cul_time==7&&Read_Color_Limit(LIMIT_BOARD)==0)
|
|
|
- {
|
|
|
- LOG_W("第七天!!!");
|
|
|
- ctr_cangmen_down(CLOSE);
|
|
|
- rt_thread_delay(500);
|
|
|
- }
|
|
|
+// if(device_status.cul_time==7&&Read_Color_Limit(LIMIT_BOARD)==0)
|
|
|
+// {
|
|
|
+// LOG_W("第七天!!!");
|
|
|
+// ctr_cangmen_down(CLOSE);
|
|
|
+// rt_thread_delay(500);
|
|
|
+// }
|
|
|
LOG_W("先打开运行到限位的右侧!");
|
|
|
while(Read_Color_Limit(LIMIT_BOARD)==0)
|
|
|
{
|
|
|
@@ -173,8 +174,6 @@ int ctr_Color_board(uint8_t forward,uint16_t time_board)
|
|
|
rt_thread_delay(10000);
|
|
|
ctr_cangmen_up(OFF);
|
|
|
if(device_status.cul_time>1)
|
|
|
- device_status.cul_time--;
|
|
|
- ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time)); //采集时间
|
|
|
return 2;
|
|
|
}
|
|
|
else if(forward==OPEN)
|
|
|
@@ -211,9 +210,9 @@ int ctr_Color_board(uint8_t forward,uint16_t time_board)
|
|
|
ctr_cangmen_up(OPEN);
|
|
|
rt_thread_delay(10000);
|
|
|
ctr_cangmen_up(OFF);
|
|
|
- if(device_status.cul_time<7)
|
|
|
- device_status.cul_time++;
|
|
|
- ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time)); //采集时间
|
|
|
+// if(device_status.cul_time<7)
|
|
|
+// device_status.cul_time++;
|
|
|
+// ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time)); //采集时间
|
|
|
return OPEN;
|
|
|
}
|
|
|
else if (forward==RESET) {
|
|
|
@@ -246,10 +245,11 @@ int ctr_Color_board(uint8_t forward,uint16_t time_board)
|
|
|
}
|
|
|
ctr_cangmen_down(OFF);
|
|
|
}
|
|
|
- device_status.cul_time = 0;
|
|
|
- ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time)); //采集时间
|
|
|
+// device_status.cul_time = 0;
|
|
|
+ //ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time)); //采集时间
|
|
|
return RESET; //复位返回0
|
|
|
}
|
|
|
+#endif
|
|
|
/**************************机器人********************************/
|
|
|
void ctr_Motor_Robot(uint8_t status_ws)
|
|
|
{
|