|
|
@@ -164,8 +164,9 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
}
|
|
|
rt_free(readinfo);
|
|
|
device_status.refresh_num--;
|
|
|
- HMI_WRITE("mqttcfg.mqtt1Message.txt=\"%s\"",device_status.mqttcfg1);
|
|
|
- HMI_WRITE("mqttcfg.mqtt2Message.txt=\"%s\"",device_status.mqttcfg2);
|
|
|
+ HMI_WRITE("workSta.iccid.txt=\"%s\"",device_status.iccid);
|
|
|
+ //HMI_WRITE("mqttcfg.mqtt1Message.txt=\"%s\"",device_status.mqttcfg1);
|
|
|
+ HMI_WRITE("uploadSet.t0.txt=\"%s\"",device_status.mqttcfg2);
|
|
|
//更新固件版本号
|
|
|
HMI_WRITE("debug.t3.txt=\"%s\"",device_status.driver);
|
|
|
//更新固件编译日期
|
|
|
@@ -663,7 +664,6 @@ void Check_ParamConfig(void)
|
|
|
device_status.vol = 7; //音量
|
|
|
device_status.timeSwitch = 1; //工作模式
|
|
|
device_status.passWord = 8888; //屏幕密码
|
|
|
- device_status.sleep_p = 70; //待机功耗
|
|
|
device_status.work_done = 0; //工作完成标志位
|
|
|
device_status.dattim = 20; //数据上传间隔
|
|
|
device_status.ds = 1; //设备状态
|
|
|
@@ -683,10 +683,6 @@ void Check_ParamConfig(void)
|
|
|
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("sleep_power", &device_status.sleep_p,sizeof(device_status.sleep_p)); //待机功耗
|
|
|
- ef_set_env_blob("lat",&device_status.lat,sizeof(device_status.lat)); //纬度
|
|
|
- ef_set_env_blob("lat",&device_status.lng,sizeof(device_status.lng)); //经度
|
|
|
- ef_set_env_blob("lat",&device_status.stamp,sizeof(device_status.stamp)); //时间
|
|
|
ef_set_env_blob("dattim",&device_status.dattim,sizeof(device_status.dattim)); //上传时间
|
|
|
ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type)); //版本类型
|
|
|
if(device_status.version_type==1)
|
|
|
@@ -708,7 +704,6 @@ void Check_ParamConfig(void)
|
|
|
rt_kprintf("jheat:%d\n",device_status.heatvale);
|
|
|
rt_kprintf("thsp:%d\n", device_status.thsp);
|
|
|
rt_kprintf("密码:%d\n",device_status.passWord);
|
|
|
- rt_kprintf("待机电流:%d\n",device_status.sleep_p);
|
|
|
|
|
|
}//从easyflash读取参数配置
|
|
|
else if (device_status.iSave==FLASH_FLAG) {
|
|
|
@@ -727,20 +722,13 @@ void Check_ParamConfig(void)
|
|
|
ef_get_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim), NULL); //数据上传间隔
|
|
|
ef_get_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp), NULL); //熄屏时间
|
|
|
ef_get_env_blob("passWord",&device_status.passWord,sizeof(device_status.passWord),NULL); //密码
|
|
|
- ef_get_env_blob("sleep_power",&device_status.sleep_p,sizeof(device_status.sleep_p),NULL); //待机功耗
|
|
|
- ef_get_env_blob("up_motor_power",&device_status.up_motor_p,sizeof(device_status.up_motor_p),NULL); //上仓门电机功耗
|
|
|
- ef_get_env_blob("down_motor_power",&device_status.down_motor_p,sizeof(device_status.down_motor_p),NULL); //下仓门电机功耗
|
|
|
- ef_get_env_blob("clear_motor_power",&device_status.clear_motor_p,sizeof(device_status.clear_motor_p),NULL); //清扫仓门电机功耗
|
|
|
- ef_get_env_blob("lamp_power",&device_status.lamp_p,sizeof(device_status.lamp_p),NULL); //镇流器功耗
|
|
|
- ef_get_env_blob("hk_power",&device_status.hk_power,sizeof(device_status.hk_power),NULL); //海康相机功耗
|
|
|
- ef_get_env_blob("led_power",&device_status.led_p,sizeof(device_status.led_p),NULL); //补光灯功耗
|
|
|
- ef_get_env_blob("shake_power",&device_status.shake_p,sizeof(device_status.shake_p),NULL); //震动电机功耗
|
|
|
- ef_get_env_blob("router_power",&device_status.router_p,sizeof(device_status.router_p),NULL); //路由器功耗
|
|
|
- ef_get_env_blob("rtu_power",&device_status.rtu_dtu_p,sizeof(device_status.rtu_dtu_p),NULL); //RTU功耗
|
|
|
- ef_get_env_blob("imei",&device_status.imei,sizeof(device_status.imei),NULL); //IMEI
|
|
|
- ef_get_env_blob("iccid",&device_status.iccid,sizeof(device_status.iccid),NULL); //数据上传间隔
|
|
|
- ef_get_env_blob("ds",&device_status.ds,sizeof(device_status.ds),NULL); //开关机状态
|
|
|
+ ef_get_env_blob("imei",&device_status.imei,sizeof(device_status.imei),NULL); //IMEI
|
|
|
+ ef_get_env_blob("iccid",&device_status.iccid,sizeof(device_status.iccid),NULL); //ICCID
|
|
|
+ ef_get_env_blob("ds",&device_status.ds,
|
|
|
+ sizeof(device_status.ds),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("driver_compile",&device_status.driver_compile,sizeof(device_status.driver_compile),NULL); //BL版本号 进BL的时候存储到FLASH
|
|
|
device_status.light_over_tim = device_status.sunBar * 3600; //光控计数
|
|
|
device_status.work_done = 0;
|
|
|
//工作完成标志位
|
|
|
@@ -761,9 +749,8 @@ void Check_ParamConfig(void)
|
|
|
else if (device_status.version_type==4) {
|
|
|
rt_sprintf(device_status.driver, "%s",VERSION_HK);
|
|
|
}
|
|
|
- ef_get_env_blob("driver_bl",&device_status.driver_bl,sizeof(device_status.driver_bl),NULL); //BL版本号 进BL的时候存储到FLASH
|
|
|
- ef_get_env_blob("driver_compile",&device_status.driver_compile,sizeof(device_status.driver_compile),NULL); //BL版本号 进BL的时候存储到FLASH
|
|
|
- LOG_I("SOFTWARE VERSION:%s\n",device_status.driver);
|
|
|
+
|
|
|
+ LOG_I("SOFTWARE VERSION:%s-imei:%s\n",device_status.driver,device_status.imei);
|
|
|
rt_kprintf("read flash paramconfis:%d-%s-%s\r\n",device_status.version_type,device_status.driver_bl,device_status.driver_compile);
|
|
|
rt_kprintf("开机次数:%d\n",device_status.rebootcnt);
|
|
|
rt_kprintf("收集时间:%d\n",device_status.clt_time);
|
|
|
@@ -779,16 +766,6 @@ void Check_ParamConfig(void)
|
|
|
rt_kprintf("低温保护:%d\n",device_status.tpl);
|
|
|
rt_kprintf("thsp:%d\n", device_status.thsp);
|
|
|
rt_kprintf("密码:%d\n",device_status.passWord);
|
|
|
- rt_kprintf("待机电流:%d\n",device_status.sleep_p);
|
|
|
- rt_kprintf("上仓门电机电流:%d\n",device_status.up_motor_p);
|
|
|
- rt_kprintf("下仓门电机电流:%d\n",device_status.down_motor_p);
|
|
|
- rt_kprintf("清扫电机电流:%d\n",device_status.clear_motor_p);
|
|
|
- rt_kprintf("镇流器电流:%d\n",device_status.lamp_p);
|
|
|
- rt_kprintf("海康相机电流:%d\n",device_status.hk_power);
|
|
|
- rt_kprintf("震动电机电流:%d\n",device_status.shake_p);
|
|
|
- rt_kprintf("路由器电流:%d\n",device_status.router_p);
|
|
|
- rt_kprintf("RTU/DTU电流:%d\n",device_status.rtu_dtu_p);
|
|
|
- rt_kprintf("加热带电流:%d\n",device_status.heat_p);
|
|
|
rt_kprintf("数据上传间隔:%d\n",device_status.dattim);
|
|
|
}
|
|
|
rt_kprintf("当前时间:%04d-%02d-%02d %02d:%02d:%02d\n",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
|