|
|
@@ -146,15 +146,15 @@ static void Hmi_thread_entry(void *parameter)
|
|
|
/***************************** 解析从屏幕收到的数据 begin **********************************/
|
|
|
static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
{
|
|
|
- char *var=NULL;
|
|
|
+ time_t now = time(RT_NULL);
|
|
|
+ static struct tm tm;
|
|
|
+ gmtime_r(&now, &tm);
|
|
|
+ char *json_temp;
|
|
|
+ char *var=NULL;
|
|
|
rt_free(var);
|
|
|
if(device_status.refresh_num==0) device_status.refresh_num = 10;
|
|
|
if(strstr(rx_buffer,"getFullData") != NULL){
|
|
|
- time_t now = time(RT_NULL);
|
|
|
- static struct tm tm;
|
|
|
- gmtime_r(&now, &tm);
|
|
|
char *readinfo = makeJson_ReadInfo();
|
|
|
-
|
|
|
if(device_status.refresh_num==5)
|
|
|
{
|
|
|
device_status.refresh_num = 15;
|
|
|
@@ -176,7 +176,6 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
device_status.refresh_num--;
|
|
|
device_status.refresh_timeout++;
|
|
|
HMI_WRITE("uploadSet.iccid.txt=\"%s\"",device_status.iccid);
|
|
|
- rt_kprintf("上传平台为:%s\n",device_status.mqttcfg1);
|
|
|
if(strstr(device_status.mqttcfg1,"8.136.98.49")!=NULL)
|
|
|
{
|
|
|
HMI_WRITE("uploadSet.plt.val=%d",RESET);
|
|
|
@@ -469,6 +468,14 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
else {
|
|
|
rt_kprintf("参数设置异常(模式):%d!!!",atoi(timeswitch_str));
|
|
|
}
|
|
|
+ //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);
|
|
|
+ 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中
|
|
|
+ if(atoi(device_status.net)==0)
|
|
|
+ DTU_Write("%s",json_temp);
|
|
|
+ rt_free(json_temp);
|
|
|
+ rt_thread_delay(2000);
|
|
|
MA_save();
|
|
|
rt_free(var);
|
|
|
rt_kprintf("工作时间参数已保存:模式-%d,光控时间-%d,时控开始时间-%d,时控结束时间-%d\n",device_status.timeSwitch,device_status.sunBar,device_status.startBar,device_status.stopBar);
|
|
|
@@ -596,9 +603,20 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
rt_sprintf(device_status.mqttcfg1, "8.136.98.49");
|
|
|
ef_set_env_blob("platform", &device_status.mqttcfg1, sizeof(device_status.mqttcfg1));
|
|
|
//给RTU发送切换指令
|
|
|
- DTU_Write("%s",makeJson_platform("8.136.98.49"));
|
|
|
- rt_free(makeJson_platform("8.136.98.49"));
|
|
|
- rt_thread_delay(2000);
|
|
|
+ if(strstr(device_status.project,"DTU_CBD")!=NULL)
|
|
|
+ {
|
|
|
+ DTU_Write("%s",makeJson_platform("8.136.98.49"));
|
|
|
+ rt_free(makeJson_platform("8.136.98.49"));
|
|
|
+ rt_thread_delay(1000);
|
|
|
+ }
|
|
|
+ //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);
|
|
|
+ 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中
|
|
|
+ if(atoi(device_status.net)==0)
|
|
|
+ DTU_Write("%s",json_temp);
|
|
|
+ rt_free(json_temp);
|
|
|
+ rt_thread_delay(1000);
|
|
|
MA_save();
|
|
|
}
|
|
|
else if (strstr(rx_buffer,"120.27.222.26")!=NULL)
|
|
|
@@ -606,22 +624,49 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
rt_sprintf(device_status.mqttcfg1, "120.27.222.26");
|
|
|
ef_set_env_blob("platform", &device_status.mqttcfg1, sizeof(device_status.mqttcfg1));
|
|
|
//给RTU发送切换指令
|
|
|
- DTU_Write("%s",makeJson_platform("120.27.222.26"));
|
|
|
- rt_free(makeJson_platform("120.27.222.26"));
|
|
|
- rt_thread_delay(2000);
|
|
|
+ if(strstr(device_status.project,"DTU_CBD")!=NULL)
|
|
|
+ {
|
|
|
+ DTU_Write("%s",makeJson_platform("120.27.222.26"));
|
|
|
+ rt_free(makeJson_platform("120.27.222.26"));
|
|
|
+ rt_thread_delay(1000);
|
|
|
+ }
|
|
|
+ //2022/06/23,add:
|
|
|
+ rt_sprintf(device_status.json_w_platform,"屏幕操作:切换平台:120.27.222.26,操作时间:%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);
|
|
|
+ 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中
|
|
|
+ if(atoi(device_status.net)==0)
|
|
|
+ DTU_Write("%s",json_temp);
|
|
|
+ rt_free(json_temp);
|
|
|
+ rt_thread_delay(1000);
|
|
|
MA_save();
|
|
|
}
|
|
|
//恢复出厂设置电池
|
|
|
else if (strstr(rx_buffer,"resetdcDefault")!=NULL)
|
|
|
{
|
|
|
ResetParamDefault_DC();
|
|
|
- MA_save();
|
|
|
+ rt_thread_delay(1000);
|
|
|
+ //2022/06/23,add:
|
|
|
+ rt_sprintf(device_status.json_w_reset,"屏幕操作:系统重置:电池供电,操作时间:%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);
|
|
|
+ json_temp = makeJson_Warn(device_status.json_w_reset, "系统重置");
|
|
|
+ ef_set_env_blob("json_w_reset", &device_status.json_w_reset, sizeof(device_status.json_w_reset)); //将修改屏幕参数操作记录保存到Flash中
|
|
|
+ if(atoi(device_status.net)==0)
|
|
|
+ DTU_Write("%s",json_temp);
|
|
|
+ rt_free(json_temp);
|
|
|
+
|
|
|
}
|
|
|
//恢复出厂设置-交流
|
|
|
else if (strstr(rx_buffer,"resetDefault")!=NULL)
|
|
|
{
|
|
|
ResetParamDefault();
|
|
|
- MA_save();
|
|
|
+ rt_thread_delay(1000);
|
|
|
+ //2022/06/23,add:
|
|
|
+ rt_sprintf(device_status.json_w_reset,"屏幕操作:系统重置:交流供电,操作时间:%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);
|
|
|
+ json_temp = makeJson_Warn(device_status.json_w_reset, "系统重置");
|
|
|
+ ef_set_env_blob("json_w_reset", &device_status.json_w_reset, sizeof(device_status.json_w_reset)); //将修改屏幕参数操作记录保存到Flash中
|
|
|
+ if(atoi(device_status.net)==0)
|
|
|
+ DTU_Write("%s",json_temp);
|
|
|
+ rt_free(json_temp);
|
|
|
+
|
|
|
}
|
|
|
//获取SIM卡信息
|
|
|
else if(strstr(rx_buffer,"getSim")!=NULL)
|
|
|
@@ -712,6 +757,18 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
|
|
|
}
|
|
|
}
|
|
|
+ else if (strstr(rx_buffer,"putTest.switchFAN_PU=1")!=NULL) {
|
|
|
+ ctr_Fan_PUT(ON);
|
|
|
+ }
|
|
|
+ else if (strstr(rx_buffer,"putTest.switchFAN_PU=0")!=NULL) {
|
|
|
+ ctr_Fan_PUT(OFF);
|
|
|
+ }
|
|
|
+ else if (strstr(rx_buffer,"putTest.switchFAN_IN=1")!=NULL) {
|
|
|
+ ctr_Fan_IN(ON);
|
|
|
+ }
|
|
|
+ else if (strstr(rx_buffer,"putTest.switchFAN_IN=0")!=NULL) {
|
|
|
+ ctr_Fan_IN(OFF);
|
|
|
+ }
|
|
|
else if(strstr(rx_buffer,"DisplayPower")!=RT_NULL)
|
|
|
{
|
|
|
HMI_WRITE("sysTest.sysTest_power.txt=\"%s\"",device_status.power);
|
|
|
@@ -780,6 +837,11 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
rt_thread_delay(1000*10);
|
|
|
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))
|
|
|
{
|
|
|
rtc_err_cnt ++;
|
|
|
@@ -1057,9 +1119,12 @@ void Check_ParamConfig(void)
|
|
|
ef_get_env_blob("ds",&device_status.ds,sizeof(device_status.ds),NULL); //开关机状态
|
|
|
ef_get_env_blob("env_t",&device_status.tempture,sizeof(device_status.tempture),NULL); //环境温度
|
|
|
ef_get_env_blob("env_h",&device_status.humidity,sizeof(device_status.humidity),NULL); //环境湿度
|
|
|
+ ef_get_env_blob("json_w_clock",&device_status.json_w_clock,sizeof(device_status.json_w_clock),NULL); //时间
|
|
|
+ ef_get_env_blob("json_w_reset",&device_status.json_w_reset,sizeof(device_status.json_w_reset),NULL); //重置
|
|
|
+ ef_get_env_blob("json_w_platform",&device_status.json_w_platform,sizeof(device_status.json_w_platform),NULL);//平台
|
|
|
ef_get_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type),NULL); //版本类型
|
|
|
ef_get_env_blob("driver_bl",&device_status.driver_bl,sizeof(device_status.driver_bl),NULL); //BL版本号 进BL的时候存储到FLASH
|
|
|
- ef_get_env_blob("platform",&device_status.mqttcfg1,sizeof(device_status.mqttcfg1),NULL); //BL版本号 进BL的时候存储到FLASH
|
|
|
+ ef_get_env_blob("platform",&device_status.mqttcfg1,sizeof(device_status.mqttcfg1),NULL); //BL版本号 进BL的时候存储到FLASH
|
|
|
device_status.light_over_tim = device_status.sunBar * 3600; //光控计数
|
|
|
device_status.work_done = 0;
|
|
|
//工作完成标志位
|
|
|
@@ -1143,7 +1208,6 @@ void Check_ParamConfig(void)
|
|
|
rt_sprintf(device_status.sim,"1");
|
|
|
ctr_router(ON);
|
|
|
Hmi_Fresh();
|
|
|
-
|
|
|
Control_clear();
|
|
|
dtu_data_play();
|
|
|
sht30_collect();
|
|
|
@@ -1208,6 +1272,7 @@ void ResetParamDefault(void)
|
|
|
ef_set_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp));
|
|
|
ef_set_env_blob("passWord", &device_status.passWord,sizeof(device_status.passWord));
|
|
|
DTU_Write("reset.mp3");
|
|
|
+ rt_thread_delay(1000);
|
|
|
}
|
|
|
void ResetParamDefault_DC(void)
|
|
|
{
|
|
|
@@ -1242,6 +1307,7 @@ void ResetParamDefault_DC(void)
|
|
|
ef_set_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp));
|
|
|
ef_set_env_blob("passWord", &device_status.passWord,sizeof(device_status.passWord));
|
|
|
DTU_Write("reset.mp3");
|
|
|
+ rt_thread_delay(1000);
|
|
|
}
|
|
|
//固件备份
|
|
|
void app_partion_backup(void)
|