|
|
@@ -312,7 +312,7 @@ static void HMI_Decode(void)
|
|
|
}
|
|
|
if(device_status.sensor_485_sta==1)
|
|
|
{
|
|
|
- HMI_WRITE("menu.sensor_state.txt=\"传感器已连接:(%s-%s)lux\"",device_status.lux,device_status.ap);
|
|
|
+ HMI_WRITE("menu.sensor_state.txt=\"传感器已连接:(%s lux-%s hpa)\"",device_status.lux,device_status.ap);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -563,7 +563,7 @@ static void HMI_Decode(void)
|
|
|
//清扫
|
|
|
else if (strstr(rx_buffer,"clear")!=NULL) {
|
|
|
rt_kprintf("\n清扫!\n");
|
|
|
- if(device_status.version_type==4||device_status.version_type==41||device_status.version_type==42)
|
|
|
+ if(device_status.version_type==4||device_status.version_type==41||device_status.version_type==42||device_status.version_type==12)
|
|
|
{
|
|
|
device_status.clear_status=1;
|
|
|
}
|
|
|
@@ -1466,21 +1466,9 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
//int current_t[200];
|
|
|
/*孢子仪拍照数量*/
|
|
|
rt_uint16_t photo_setup = 0;
|
|
|
- #if Color_EN ==1
|
|
|
- ctr_Color_board(RESET, 1200);
|
|
|
- #endif
|
|
|
while(1)
|
|
|
{
|
|
|
- #if Color_EN ==1
|
|
|
- //定时执行把粘虫板更换的操作,每天一次
|
|
|
- if(device_status.run_sta==5)
|
|
|
- {
|
|
|
- rt_thread_delay(2000);
|
|
|
- device_status.run_sta = 0;
|
|
|
- ctr_Color_board(OPEN, 1000);
|
|
|
- }
|
|
|
- #endif
|
|
|
- #if 1
|
|
|
+ #if 0
|
|
|
time_t time_reset12V;
|
|
|
time(&time_reset12V);
|
|
|
static struct tm alarm_reset12V;
|