|
@@ -175,6 +175,8 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
rt_free(readinfo);
|
|
rt_free(readinfo);
|
|
|
device_status.refresh_num--;
|
|
device_status.refresh_num--;
|
|
|
device_status.refresh_timeout++;
|
|
device_status.refresh_timeout++;
|
|
|
|
|
+ if(device_status.version_type!=6)
|
|
|
|
|
+ {
|
|
|
HMI_WRITE("uploadSet.iccid.txt=\"%s\"",device_status.iccid);
|
|
HMI_WRITE("uploadSet.iccid.txt=\"%s\"",device_status.iccid);
|
|
|
if(strstr(device_status.mqttcfg1,"8.136.98.49")!=NULL)
|
|
if(strstr(device_status.mqttcfg1,"8.136.98.49")!=NULL)
|
|
|
{
|
|
{
|
|
@@ -240,8 +242,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
HMI_WRITE("sysSet.jheat.val=%d",device_status.heatvalue);
|
|
HMI_WRITE("sysSet.jheat.val=%d",device_status.heatvalue);
|
|
|
//更新加热状态
|
|
//更新加热状态
|
|
|
HMI_WRITE("workSta.heatStatus.val=%d",device_status.heat_status);
|
|
HMI_WRITE("workSta.heatStatus.val=%d",device_status.heat_status);
|
|
|
- //更新熄屏时间
|
|
|
|
|
- HMI_WRITE("thsp=%d",device_status.thsp);
|
|
|
|
|
|
|
+
|
|
|
//更新密码
|
|
//更新密码
|
|
|
static char pwd_char[10];
|
|
static char pwd_char[10];
|
|
|
//整型转字符串
|
|
//整型转字符串
|
|
@@ -260,11 +261,14 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
HMI_WRITE("workSta.bt0.val=%d",atoi(device_status.sim));
|
|
HMI_WRITE("workSta.bt0.val=%d",atoi(device_status.sim));
|
|
|
//ID
|
|
//ID
|
|
|
HMI_WRITE("menu.equipid.txt=\"%s\"",device_status.imei);
|
|
HMI_WRITE("menu.equipid.txt=\"%s\"",device_status.imei);
|
|
|
- HMI_WRITE("workSta.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("uploadSet.datt.val=%d",device_status.dattim);
|
|
|
//语音音量
|
|
//语音音量
|
|
|
HMI_WRITE("sysSet.vol.val=%d",device_status.vol);
|
|
HMI_WRITE("sysSet.vol.val=%d",device_status.vol);
|
|
|
|
|
+ //更新熄屏时间
|
|
|
|
|
+ HMI_WRITE("thsp=%d",device_status.thsp);
|
|
|
|
|
+ }
|
|
|
//更新联网状态
|
|
//更新联网状态
|
|
|
if(atoi(device_status.net)==1)
|
|
if(atoi(device_status.net)==1)
|
|
|
{
|
|
{
|
|
@@ -281,19 +285,42 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
HMI_WRITE("workSta.net.val=2");
|
|
HMI_WRITE("workSta.net.val=2");
|
|
|
}
|
|
}
|
|
|
/**********************************吸虫塔*********************************/
|
|
/**********************************吸虫塔*********************************/
|
|
|
- //更新电压
|
|
|
|
|
- HMI_WRITE("menu.vbat.txt=\"%sV\"",device_status.voltage);
|
|
|
|
|
- //更新震动时间
|
|
|
|
|
- HMI_WRITE("menu.shake_sec.val=%d",device_status.shake_sec);
|
|
|
|
|
- //更新电流
|
|
|
|
|
- HMI_WRITE("menu.power.txt=\"%smA\"",device_status.power);
|
|
|
|
|
- //更新温湿度数据
|
|
|
|
|
- HMI_WRITE("menu.envHum.val=%d",atoi(device_status.humidity));
|
|
|
|
|
- HMI_WRITE("menu.envTem.val=%d",atoi(device_status.tempture));
|
|
|
|
|
- //SIM卡状态
|
|
|
|
|
- HMI_WRITE("menu.bt0.val=%d",atoi(device_status.sim));
|
|
|
|
|
- //数据上传间隔
|
|
|
|
|
- HMI_WRITE("menu.datt.val=%d",device_status.dattim);
|
|
|
|
|
|
|
+ if(device_status.version_type==6)
|
|
|
|
|
+ {
|
|
|
|
|
+ HMI_WRITE("menu.equipid.txt=\"%s\"",device_status.imei);
|
|
|
|
|
+ //更新电压
|
|
|
|
|
+ HMI_WRITE("menu.vbat.txt=\"%sV\"",device_status.voltage);
|
|
|
|
|
+ //工作状态
|
|
|
|
|
+ HMI_WRITE("menu.worksta.val=%d",device_status.work_status);
|
|
|
|
|
+ //网卡0状态
|
|
|
|
|
+ HMI_WRITE("menu.eth0_sta.val=%d",device_status.link_sta);
|
|
|
|
|
+ //更新电流
|
|
|
|
|
+ HMI_WRITE("menu.power.txt=\"%smA\"",device_status.power);
|
|
|
|
|
+ //更新温湿度数据
|
|
|
|
|
+ HMI_WRITE("menu.envHum.txt=\"%s%RH\"",device_status.humidity);
|
|
|
|
|
+ HMI_WRITE("menu.envTem.txt=\"%s℃\"",device_status.tempture);
|
|
|
|
|
+ HMI_WRITE("uploadSet.st.val=%d",device_status.startBar);
|
|
|
|
|
+ HMI_WRITE("uploadSet.et.val=%d",device_status.stopBar);
|
|
|
|
|
+ HMI_WRITE("menu.board_temp.txt=\"%d.%d℃\"",Get_Temprate()/100,Get_Temprate()%100);
|
|
|
|
|
+ //数据上传间隔
|
|
|
|
|
+ HMI_WRITE("menu.datt.val=%d",device_status.dattim);
|
|
|
|
|
+ //SIM卡状态
|
|
|
|
|
+ HMI_WRITE("menu.bt0.val=%d",atoi(device_status.sim));
|
|
|
|
|
+ //更新震动时间
|
|
|
|
|
+ HMI_WRITE("menu.shake_sec.val=%d",device_status.shake_sec);
|
|
|
|
|
+ //校准屏幕的RTC
|
|
|
|
|
+ HMI_WRITE("rtc0=%d",tm.tm_year+1900);
|
|
|
|
|
+ HMI_WRITE("rtc1=%d",tm.tm_mon+1);
|
|
|
|
|
+ HMI_WRITE("rtc2=%d",tm.tm_mday);
|
|
|
|
|
+ HMI_WRITE("rtc3=%d",tm.tm_hour+8);
|
|
|
|
|
+ HMI_WRITE("rtc4=%d",tm.tm_min);
|
|
|
|
|
+ HMI_WRITE("rtc5=%d",tm.tm_sec);
|
|
|
|
|
+
|
|
|
|
|
+ //更新熄屏时间
|
|
|
|
|
+ HMI_WRITE("thsp=%d",device_status.thsp);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
/**********************************************************************/
|
|
/**********************************************************************/
|
|
|
}
|
|
}
|
|
|
else if (strstr(rx_buffer,"getClockData")!=NULL) {
|
|
else if (strstr(rx_buffer,"getClockData")!=NULL) {
|
|
@@ -417,11 +444,18 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
var=strstr(rx_buffer,"=");
|
|
var=strstr(rx_buffer,"=");
|
|
|
var++;
|
|
var++;
|
|
|
strncpy(value_str,var,2);
|
|
strncpy(value_str,var,2);
|
|
|
- if(atoi(value_str) > 0 && atoi(value_str) <12)
|
|
|
|
|
|
|
+ if(atoi(value_str) > 0 && atoi(value_str) <60)
|
|
|
{
|
|
{
|
|
|
#if LAMP_EN == 0
|
|
#if LAMP_EN == 0
|
|
|
|
|
+ if(device_status.version_type!=6)
|
|
|
|
|
+ {
|
|
|
device_status.sunBar=atoi(value_str);
|
|
device_status.sunBar=atoi(value_str);
|
|
|
ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));
|
|
ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));
|
|
|
|
|
+ }
|
|
|
|
|
+ else {
|
|
|
|
|
+ device_status.shake_sec = atoi(value_str);
|
|
|
|
|
+ ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));
|
|
|
|
|
+ }
|
|
|
#else
|
|
#else
|
|
|
rt_kprintf("光控定时设置失败!!!,三光源模式!!\n");
|
|
rt_kprintf("光控定时设置失败!!!,三光源模式!!\n");
|
|
|
#endif
|
|
#endif
|
|
@@ -461,7 +495,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
}
|
|
}
|
|
|
memset(value_str,0,sizeof(value_str));
|
|
memset(value_str,0,sizeof(value_str));
|
|
|
//
|
|
//
|
|
|
- strncpy(value_str,var+7,2);
|
|
|
|
|
|
|
+ strncpy(value_str,var+6,2);
|
|
|
if(atoi(value_str) >= 0 && atoi(value_str) <= 1)
|
|
if(atoi(value_str) >= 0 && atoi(value_str) <= 1)
|
|
|
{
|
|
{
|
|
|
#if LAMP_EN == 0
|
|
#if LAMP_EN == 0
|
|
@@ -470,10 +504,19 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
#endif
|
|
#endif
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
- rt_kprintf("参数设置异常(模式):%d!!!",atoi(value_str));
|
|
|
|
|
|
|
+ if(device_status.version_type==6)
|
|
|
|
|
+ {
|
|
|
|
|
+ device_status.timeSwitch=1;
|
|
|
|
|
+ device_status.dattim=atoi(value_str);
|
|
|
|
|
+ ef_set_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim));
|
|
|
|
|
+ ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
|
|
|
|
|
+ }
|
|
|
|
|
+ else {
|
|
|
|
|
+ rt_kprintf("参数设置异常(模式):%d!!!",atoi(value_str));
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
//2022/06/23,add:
|
|
//2022/06/23,add:
|
|
|
- rt_sprintf(device_status.json_w_clock,"屏幕操作:修改工作时间:开始-%d,结束-%d,模式-%d(0-光控,1-时控)操作时间:%04d-%02d-%02d %02d:%02d:%02d",device_status.startBar,device_status.stopBar,device_status.timeSwitch,tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
|
|
|
|
|
|
|
+ rt_sprintf(device_status.json_w_clock,"屏幕操作:修改工作时间:开始-%d,结束-%d,模式-%d(0-光控,1-时控)操作时间:%s",device_status.startBar,device_status.stopBar,device_status.timeSwitch,device_status.stamp);
|
|
|
json_temp = makeJson_Warn(device_status.json_w_clock, "修改工作时间");
|
|
json_temp = makeJson_Warn(device_status.json_w_clock, "修改工作时间");
|
|
|
ef_set_env_blob("json_w_clock", &device_status.json_w_clock, sizeof(device_status.json_w_clock)); //将修改屏幕参数操作记录保存到Flash中
|
|
ef_set_env_blob("json_w_clock", &device_status.json_w_clock, sizeof(device_status.json_w_clock)); //将修改屏幕参数操作记录保存到Flash中
|
|
|
if(atoi(device_status.net)==0)
|
|
if(atoi(device_status.net)==0)
|
|
@@ -615,7 +658,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
rt_thread_delay(1000);
|
|
rt_thread_delay(1000);
|
|
|
}
|
|
}
|
|
|
//2022/06/23,add:
|
|
//2022/06/23,add:
|
|
|
- rt_sprintf(device_status.json_w_platform,"屏幕操作:切换平台:8.136.98.49,操作时间:%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
|
|
|
|
|
|
|
+ rt_sprintf(device_status.json_w_platform,"屏幕操作:切换平台:8.136.98.49,操作时间:%s",device_status.stamp);
|
|
|
json_temp = makeJson_Warn(device_status.json_w_platform, "切换平台");
|
|
json_temp = makeJson_Warn(device_status.json_w_platform, "切换平台");
|
|
|
ef_set_env_blob("json_w_platform", &device_status.json_w_platform, sizeof(device_status.json_w_platform)); //将修改屏幕参数操作记录保存到Flash中
|
|
ef_set_env_blob("json_w_platform", &device_status.json_w_platform, sizeof(device_status.json_w_platform)); //将修改屏幕参数操作记录保存到Flash中
|
|
|
if(atoi(device_status.net)==0)
|
|
if(atoi(device_status.net)==0)
|
|
@@ -842,17 +885,12 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
time(&time_reset12V);
|
|
time(&time_reset12V);
|
|
|
static struct tm alarm_reset12V;
|
|
static struct tm alarm_reset12V;
|
|
|
alarm_reset12V =*localtime(&time_reset12V);
|
|
alarm_reset12V =*localtime(&time_reset12V);
|
|
|
- if((alarm_reset12V.tm_hour)==5&&(alarm_reset12V.tm_min==59)&&(alarm_reset12V.tm_sec==55))
|
|
|
|
|
|
|
+ if((alarm_reset12V.tm_hour)==7&&(alarm_reset12V.tm_min==19)&&(alarm_reset12V.tm_sec==50))
|
|
|
{
|
|
{
|
|
|
ctr_RTU_DTU(OFF);
|
|
ctr_RTU_DTU(OFF);
|
|
|
rt_thread_delay(1000*10);
|
|
rt_thread_delay(1000*10);
|
|
|
ctr_RTU_DTU(ON);
|
|
ctr_RTU_DTU(ON);
|
|
|
}
|
|
}
|
|
|
- else if ((alarm_reset12V.tm_hour)==6&&(alarm_reset12V.tm_min==01)&&(alarm_reset12V.tm_sec==30)) {
|
|
|
|
|
- ctr_RTU_DTU(OFF);
|
|
|
|
|
- rt_thread_delay(1000*10);
|
|
|
|
|
- ctr_RTU_DTU(ON);
|
|
|
|
|
- }
|
|
|
|
|
else if((alarm_reset12V.tm_hour)==0&&(alarm_reset12V.tm_min==0)&&(alarm_reset12V.tm_sec==0))
|
|
else if((alarm_reset12V.tm_hour)==0&&(alarm_reset12V.tm_min==0)&&(alarm_reset12V.tm_sec==0))
|
|
|
{
|
|
{
|
|
|
rtc_err_cnt ++;
|
|
rtc_err_cnt ++;
|
|
@@ -1256,6 +1294,7 @@ void Check_ParamConfig(void)
|
|
|
}
|
|
}
|
|
|
if(device_status.version_type==6) device_status.timeSwitch = 1;
|
|
if(device_status.version_type==6) device_status.timeSwitch = 1;
|
|
|
DTU_Write("%s",makeJson_Warn("turnon", "device_stm32"));
|
|
DTU_Write("%s",makeJson_Warn("turnon", "device_stm32"));
|
|
|
|
|
+ rt_thread_delay(1000);
|
|
|
#endif
|
|
#endif
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -1290,6 +1329,7 @@ void ResetParamDefault(void)
|
|
|
ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec)); //震动时间
|
|
ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec)); //震动时间
|
|
|
ef_set_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp));
|
|
ef_set_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp));
|
|
|
ef_set_env_blob("passWord", &device_status.passWord,sizeof(device_status.passWord));
|
|
ef_set_env_blob("passWord", &device_status.passWord,sizeof(device_status.passWord));
|
|
|
|
|
+ HMI_WRITE("play %d,%d,%d",1,5,0);
|
|
|
DTU_Write("reset.mp3");
|
|
DTU_Write("reset.mp3");
|
|
|
rt_thread_delay(1000);
|
|
rt_thread_delay(1000);
|
|
|
}
|
|
}
|