|
|
@@ -239,7 +239,7 @@ void Start_timer_Uart2(void)
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
+static char str_temp[128] = {};
|
|
|
/***************************** 解析从屏幕收到的数据 begin **********************************/
|
|
|
static void HMI_Decode(void)
|
|
|
{
|
|
|
@@ -633,9 +633,8 @@ static void HMI_Decode(void)
|
|
|
}
|
|
|
}
|
|
|
//2022/06/23,add:
|
|
|
- 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, "修改工作时间");
|
|
|
- ef_set_env_blob("json_w_clock", &device_status.json_w_clock, sizeof(device_status.json_w_clock)); //将修改屏幕参数操作记录保存到Flash中
|
|
|
+ rt_sprintf(str_temp,"屏幕操作:修改工作时间:开始-%d,结束-%d,模式-%d(0-光控,1-时控)操作时间:%s",device_status.startBar,device_status.stopBar,device_status.timeSwitch,device_status.stamp);
|
|
|
+ json_temp = makeJson_Warn(str_temp, "修改工作时间");
|
|
|
if(atoi(device_status.net)==0)
|
|
|
DTU_Write("%s",json_temp);
|
|
|
rt_free(json_temp);
|
|
|
@@ -775,9 +774,9 @@ static void HMI_Decode(void)
|
|
|
ResetParamDefault_DC();
|
|
|
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中
|
|
|
+ memset(str_temp,0,sizeof(str_temp));
|
|
|
+ rt_sprintf(str_temp,"屏幕操作:系统重置:电池供电,操作时间:%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(str_temp, "系统重置");
|
|
|
if(atoi(device_status.net)==0)
|
|
|
DTU_Write("%s",json_temp);
|
|
|
rt_free(json_temp);
|
|
|
@@ -789,9 +788,9 @@ static void HMI_Decode(void)
|
|
|
ResetParamDefault();
|
|
|
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中
|
|
|
+ memset(str_temp,0,sizeof(str_temp));
|
|
|
+ rt_sprintf(str_temp,"屏幕操作:系统重置:交流供电,操作时间:%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(str_temp, "系统重置");
|
|
|
if(atoi(device_status.net)==0)
|
|
|
DTU_Write("%s",json_temp);
|
|
|
rt_free(json_temp);
|
|
|
@@ -1225,8 +1224,6 @@ void ResetParamDefault(void)
|
|
|
device_status.startBar = 9; //定时开始时间
|
|
|
device_status.stopBar = 18; //定时结束时间
|
|
|
|
|
|
- device_status.heattime = 10; //加热时间
|
|
|
-
|
|
|
device_status.sunBar = 8;
|
|
|
device_status.tph = 70; //高温保护阈值
|
|
|
device_status.tpl = -5; //低温保护阈值
|
|
|
@@ -1270,9 +1267,6 @@ void ResetParamDefault_DC(void)
|
|
|
ef_set_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim)); //数据上传间隔
|
|
|
device_status.startBar = 10; //定时开始时间
|
|
|
device_status.stopBar = 22; //定时结束时间
|
|
|
- device_status.heattime = 10; //加热时间
|
|
|
- device_status.shake_ws = 1; //针对开关
|
|
|
- device_status.shake_sec = 1; //震动时间1-100ms
|
|
|
device_status.sunBar = 4;
|
|
|
device_status.Power_Type = 1;
|
|
|
device_status.tph = 70; //高温保护阈值
|
|
|
@@ -1296,8 +1290,6 @@ void ResetParamDefault_DC(void)
|
|
|
ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));
|
|
|
ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph));
|
|
|
ef_set_env_blob("tpl", &device_status.tpl, sizeof(device_status.tpl));
|
|
|
- ef_set_env_blob("shake_ws", &device_status.shake_ws, sizeof(device_status.shake_ws)); //震动开关
|
|
|
- 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("passWord", &device_status.passWord,sizeof(device_status.passWord));
|
|
|
ef_set_env_blob("Power_Type", &device_status.Power_Type,sizeof(device_status.Power_Type));
|