|
|
@@ -211,20 +211,20 @@ static void HMI_Decode(void)
|
|
|
HMI_WRITE("set.t1.txt=\"%d\"",tm.tm_min);
|
|
|
HMI_WRITE("set.t2.txt=\"%d\"",tm.tm_sec);
|
|
|
//更新电压
|
|
|
- HMI_WRITE("workSta.vbat.txt=\"%s\"",device_status.voltage);
|
|
|
+ HMI_WRITE("menu.vbat.txt=\"%s\"",device_status.voltage);
|
|
|
//更新电流
|
|
|
- HMI_WRITE("workSta.power.txt=\"%s\"",device_status.power);
|
|
|
+ HMI_WRITE("menu.power.txt=\"%s\"",device_status.power);
|
|
|
//更新温湿度数据
|
|
|
- HMI_WRITE("workSta.envHum.val=%d",atoi(device_status.humidity));
|
|
|
- HMI_WRITE("workSta.envTem.val=%d",atoi(device_status.tempture));
|
|
|
+ HMI_WRITE("menu.envHum.val=%d",atoi(device_status.humidity));
|
|
|
+ HMI_WRITE("menu.envTem.val=%d",atoi(device_status.tempture));
|
|
|
//更新电池状态
|
|
|
- HMI_WRITE("workSta.batStatus.val=%d",device_status.bat_status);
|
|
|
+ HMI_WRITE("menu.batStatus.val=%d",device_status.bat_status);
|
|
|
//更新上仓门状态
|
|
|
HMI_WRITE("workSta.upStatus.val=%d",device_status.up_status);
|
|
|
//更新下仓门状态
|
|
|
HMI_WRITE("workSta.downStatus.val=%d",device_status.down_status);
|
|
|
//更新工作状态
|
|
|
- HMI_WRITE("workSta.workStatus.val=%d",device_status.work_status);
|
|
|
+ HMI_WRITE("menu.workStatus.val=%d",device_status.work_status);
|
|
|
//更新温控状态
|
|
|
HMI_WRITE("workSta.tempStatus.val=%d",device_status.temp_status);
|
|
|
//更新雨控状态
|
|
|
@@ -267,9 +267,19 @@ static void HMI_Decode(void)
|
|
|
HMI_WRITE("menu.equipid.txt=\"%s\"",device_status.imei);
|
|
|
//HMI_WRITE("workSta.equipid.txt=\"%s\"",device_status.imei);
|
|
|
//数据上传间隔
|
|
|
- HMI_WRITE("uploadSet.datt.val=%d",device_status.dattim);
|
|
|
+ HMI_WRITE("menu.datt.txt=\"%d\"",device_status.dattim);
|
|
|
+ HMI_WRITE("menu.next.txt=\"%d\"",device_status.num_updata);
|
|
|
//语音音量
|
|
|
HMI_WRITE("sysSet.vol.val=%d",device_status.vol);
|
|
|
+ //主板温度
|
|
|
+ HMI_WRITE("menu.bt.txt=\"%d.%d\"",Get_Temprate()/100,Get_Temprate()%100);
|
|
|
+ //
|
|
|
+ HMI_WRITE("menu.t4.txt=\"%d:00-%d:00\"",device_status.startBar,device_status.stopBar);
|
|
|
+ //
|
|
|
+ HMI_WRITE("menu.ct.txt=\"%d\"",device_status.all_ycct);
|
|
|
+ //
|
|
|
+ HMI_WRITE("menu.version.txt=\"%s\"",device_status.driver);
|
|
|
+ HMI_WRITE("menu.build.txt=\"%s\"",device_status.driver_compile);
|
|
|
//更新熄屏时间
|
|
|
if(device_status.thsp<60) device_status.thsp = device_status.thsp * 60;
|
|
|
HMI_WRITE("thsp=%d",device_status.thsp);
|
|
|
@@ -1271,7 +1281,7 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
rt_uint16_t num_up_close = 200; //
|
|
|
rt_uint16_t num_down_open = 200; //
|
|
|
rt_uint16_t num_down_close = 200; //
|
|
|
- rt_int16_t photo_led_sec = 900; //55S
|
|
|
+ rt_int16_t photo_led_sec = 900; //90S
|
|
|
|
|
|
//int current_t[200];
|
|
|
/*孢子仪拍照数量*/
|
|
|
@@ -1421,21 +1431,10 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
//拍照
|
|
|
if(device_status.photo_ws==1)
|
|
|
{
|
|
|
+ photo_led_sec--;
|
|
|
ctr_led(ON);
|
|
|
//打开补光灯
|
|
|
- if(photo_led_sec==300&&device_status.version_type==48)
|
|
|
- {
|
|
|
- DTU_Write("takephoto.mp3");
|
|
|
- //延时
|
|
|
- rt_thread_delay(1000);
|
|
|
- LOG_I("测试拍照!");
|
|
|
- Hk_Take_io();
|
|
|
- char *takephotojson = makeJson_takephoto();
|
|
|
- DTU_Write("%s",takephotojson);
|
|
|
- rt_free(takephotojson);
|
|
|
- }
|
|
|
- //15S后执行拍照
|
|
|
- else if (photo_led_sec==750&&device_status.version_type!=48)
|
|
|
+ if(photo_led_sec==890)
|
|
|
{
|
|
|
DTU_Write("takephoto.mp3");
|
|
|
//延时
|
|
|
@@ -1446,8 +1445,8 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
DTU_Write("%s",takephotojson);
|
|
|
rt_free(takephotojson);
|
|
|
}
|
|
|
- photo_led_sec--;
|
|
|
- if(photo_led_sec==0&&device_status.version_type==48) //4800W相机
|
|
|
+
|
|
|
+ if(photo_led_sec==600) //4800W相机
|
|
|
{
|
|
|
ctr_led(OFF);
|
|
|
photo_led_sec = 900;
|
|
|
@@ -1455,14 +1454,21 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
HMI_WRITE("sysTest.switchPhoto.val=0");
|
|
|
HMI_WRITE("sysTest.switchFill.val=0");
|
|
|
}
|
|
|
- else if (photo_led_sec==550&&device_status.version_type!=48) {
|
|
|
- ctr_led(OFF);
|
|
|
+
|
|
|
+ }else if(device_status.photo_ws ==2){
|
|
|
+ ctr_led(ON);
|
|
|
+ photo_led_sec--;
|
|
|
+ if(photo_led_sec==890){
|
|
|
+ DTU_Write("takephoto.mp3");
|
|
|
+ rt_thread_delay(2000);
|
|
|
+ DTU_Write(makeJson_ParsePhoto());
|
|
|
+ }else if(photo_led_sec==600){
|
|
|
photo_led_sec = 900;
|
|
|
+ ctr_led(OFF);
|
|
|
device_status.photo_ws = 0;
|
|
|
- HMI_WRITE("sysTest.switchPhoto.val=0");
|
|
|
- HMI_WRITE("sysTest.switchFill.val=0");
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
/*对焦拍照*/
|
|
|
if(device_status.autotakepic==1)
|
|
|
{
|
|
|
@@ -1914,7 +1920,7 @@ void Check_ParamConfig(void)
|
|
|
Control_clear();
|
|
|
Control_heat();
|
|
|
#endif
|
|
|
- if(device_status.dtype!=7)
|
|
|
+ if(device_status.dtype!=7&&device_status.dtype!=8)
|
|
|
{
|
|
|
Control_clear();
|
|
|
Control_heat();
|