|
|
@@ -207,7 +207,6 @@ static void dtu_thread_entry_send(void *parameter)
|
|
|
if(device_status.dattim==0) device_status.dattim=20; //数据上传时间间隔设置为0?
|
|
|
if(device_status.bat_status==0) device_status.power_status = 1; //解除欠压,清除标志位
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
else {
|
|
|
rt_kprintf("wait connect internet......\n");
|
|
|
@@ -396,8 +395,17 @@ char * makeJson()
|
|
|
rt_sprintf(device_status.driver,"%s-%s",VERSION_ZP,device_status.driver_4g);
|
|
|
}
|
|
|
else if (device_status.version_type==4) {
|
|
|
+ rt_sprintf(device_status.driver,"%s-%s",VERSION_HK_2000W,device_status.driver_4g);
|
|
|
+ }
|
|
|
+ else if (device_status.version_type==41) {
|
|
|
rt_sprintf(device_status.driver,"%s-%s",VERSION_HK,device_status.driver_4g);
|
|
|
}
|
|
|
+ else if (device_status.version_type==11) {
|
|
|
+ rt_sprintf(device_status.driver,"%s-%s",VERSION_GK,device_status.driver_4g);
|
|
|
+ }
|
|
|
+ else if (device_status.version_type==6) {
|
|
|
+ rt_sprintf(device_status.driver,"%s-%s",VERSION_XCT,device_status.driver_4g);
|
|
|
+ }
|
|
|
cJSON_AddItemToObject(pJsonRoot, "ext", pSubJson);
|
|
|
cJSON_AddStringToObject(pSubJson, "dver", device_status.driver); //版本号,字符型
|
|
|
cJSON_AddStringToObject(pSubJson,"proj",device_status.project); //项目类型
|
|
|
@@ -405,98 +413,125 @@ char * makeJson()
|
|
|
device_status.dtype=3;
|
|
|
rt_sprintf(utos, "%d",device_status.dtype);
|
|
|
cJSON_AddStringToObject(pSubJson,"dtype",utos);
|
|
|
- //光控定时
|
|
|
- rt_sprintf(utos, "%d",device_status.sunBar);
|
|
|
- cJSON_AddStringToObject(pSubJson,"tt",utos);
|
|
|
- //震动开关
|
|
|
- rt_sprintf(utos, "%d",device_status.shake_ws);
|
|
|
- cJSON_AddStringToObject(pSubJson,"shake",utos);
|
|
|
- //震动时间
|
|
|
- rt_sprintf(utos, "%d",device_status.shake_sec);
|
|
|
- cJSON_AddStringToObject(pSubJson,"shake_sec",utos);
|
|
|
+ //类型细分
|
|
|
+ if(device_status.version_type==4) //水稻
|
|
|
+ {
|
|
|
+ rt_sprintf(utos,"4");
|
|
|
+ cJSON_AddStringToObject(pSubJson,"vtype",utos);
|
|
|
+ }
|
|
|
+ else if (device_status.version_type==1) { //1.0
|
|
|
+ rt_sprintf(utos,"1");
|
|
|
+ cJSON_AddStringToObject(pSubJson,"vtype",utos);
|
|
|
+ }
|
|
|
+ else if (device_status.version_type==11) { //高空
|
|
|
+ rt_sprintf(utos,"11");
|
|
|
+ cJSON_AddStringToObject(pSubJson,"vtype",utos);
|
|
|
+ }
|
|
|
+ else if (device_status.version_type==5) { //5.0
|
|
|
+ rt_sprintf(utos,"5");
|
|
|
+ cJSON_AddStringToObject(pSubJson,"vtype",utos);
|
|
|
+ }
|
|
|
+ else if (device_status.version_type==6) { //吸虫塔
|
|
|
+ rt_sprintf(utos,"6");
|
|
|
+ cJSON_AddStringToObject(pSubJson,"vtype",utos);
|
|
|
+ }
|
|
|
+ if(device_status.version_type!=6)
|
|
|
+ {
|
|
|
+ //光控定时
|
|
|
+ rt_sprintf(utos, "%d",device_status.sunBar);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"tt",utos);
|
|
|
+ //工作状态
|
|
|
+ rt_sprintf(utos, "%d",device_status.work_status);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"ws",utos);
|
|
|
+ //定时模式
|
|
|
+ rt_sprintf(utos, "%d",device_status.timeSwitch);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"ts",utos);
|
|
|
+ //开始时间
|
|
|
+ rt_sprintf(utos, "%d",device_status.startBar);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"st",utos);
|
|
|
+ //结束时间
|
|
|
+ rt_sprintf(utos, "%d",device_status.stopBar);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"et",utos);
|
|
|
+ //温控
|
|
|
+ rt_sprintf(utos, "%d",device_status.temp_status);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"tps",utos);
|
|
|
+ //光控状态
|
|
|
+ rt_sprintf(utos, "%d",device_status.sun_status);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"lps",utos);
|
|
|
+ //雨控状态
|
|
|
+ rt_sprintf(utos, "%d",device_status.rain_status);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"rps",utos);
|
|
|
+ //电池状态
|
|
|
+ rt_sprintf(utos, "%d",device_status.bat_status);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"batStatus",utos);
|
|
|
+ //灯管状态
|
|
|
+ rt_sprintf(utos, "%d",device_status.lamp_status);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"lamp",utos);
|
|
|
+ //上仓门状态 1-打开,0-关闭-(通道) 打开为落虫,关闭为排水
|
|
|
+ rt_sprintf(utos, "%d",device_status.up_status);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"upds",utos);
|
|
|
+ //下仓门状态 1-打开,0-关闭
|
|
|
+ rt_sprintf(utos, "%d",device_status.down_status);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"dnds",utos);
|
|
|
+ //加热仓温度
|
|
|
+ rt_sprintf(utos, "%d",device_status.heattem);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"hrt",utos);
|
|
|
+ //加热状态
|
|
|
+ rt_sprintf(utos, "%d",device_status.heat_status);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"hs",utos);
|
|
|
+ //收集时间(参数)
|
|
|
+ rt_sprintf(utos, "%d",device_status.clt_time);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"collt",utos);
|
|
|
+ //加热时间(参数)
|
|
|
+ rt_sprintf(utos, "%d",device_status.heattime);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"htim",utos);
|
|
|
+ //加热温度(参数)
|
|
|
+ rt_sprintf(utos, "%d",device_status.heatvalue);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"hst",utos);
|
|
|
+ //高温保护
|
|
|
+ rt_sprintf(utos, "%d",device_status.tph);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"tph",utos);
|
|
|
+ //低温保护
|
|
|
+ rt_sprintf(utos, "%d",device_status.tpl);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"tpl",utos);
|
|
|
+ }
|
|
|
+ //震动开关
|
|
|
+ rt_sprintf(utos, "%d",device_status.shake_ws);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"shake",utos);
|
|
|
+ //震动时间
|
|
|
+ rt_sprintf(utos, "%d",device_status.shake_sec);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"shake_sec",utos);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"gps",device_status.gps); //定位状态
|
|
|
+ //开关状态
|
|
|
+ rt_sprintf(utos, "%d",device_status.ds);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"ds",utos);
|
|
|
+ //湿度
|
|
|
+ cJSON_AddStringToObject(pSubJson,"ah",device_status.humidity);
|
|
|
+ //温度
|
|
|
+ cJSON_AddStringToObject(pSubJson,"at",device_status.tempture);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"imei",device_status.imei); //IMEI
|
|
|
+ cJSON_AddStringToObject(pSubJson,"iccid",device_status.iccid); //ICCID
|
|
|
+ cJSON_AddStringToObject(pSubJson,"stamp",device_status.stamp); //时间
|
|
|
+ //经度
|
|
|
+ cJSON_AddStringToObject(pSubJson,"lng",device_status.lng);
|
|
|
+ //纬度
|
|
|
+ cJSON_AddStringToObject(pSubJson,"lat",device_status.lat);
|
|
|
+ //是否为上电开机
|
|
|
+ cJSON_AddNumberToObject(pSubJson,"rcnt",device_status.rebootcnt);
|
|
|
+ //电流(当前)
|
|
|
+ cJSON_AddStringToObject(pSubJson,"current",device_status.power);
|
|
|
+ //电压
|
|
|
+ cJSON_AddStringToObject(pSubJson,"vbat",device_status.voltage);
|
|
|
+ //保险丝电压
|
|
|
+ cJSON_AddStringToObject(pSubJson,"fuse_voltage",device_status.fuse_voltage);
|
|
|
+ //数据上传间隔
|
|
|
+ rt_sprintf(utos, "%d",device_status.dattim);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"dat_f",utos);
|
|
|
+
|
|
|
+ //信号强度
|
|
|
+ cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
|
|
|
+
|
|
|
|
|
|
- cJSON_AddStringToObject(pSubJson,"gps",device_status.gps); //定位状态
|
|
|
- //工作状态
|
|
|
- rt_sprintf(utos, "%d",device_status.work_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"ws",utos);
|
|
|
- //工作状态
|
|
|
- rt_sprintf(utos, "%d",device_status.ds);
|
|
|
- cJSON_AddStringToObject(pSubJson,"ds",utos);
|
|
|
- //定时模式
|
|
|
- rt_sprintf(utos, "%d",device_status.timeSwitch);
|
|
|
- cJSON_AddStringToObject(pSubJson,"ts",utos);
|
|
|
- //开始时间
|
|
|
- rt_sprintf(utos, "%d",device_status.startBar);
|
|
|
- cJSON_AddStringToObject(pSubJson,"st",utos);
|
|
|
- //结束时间
|
|
|
- rt_sprintf(utos, "%d",device_status.stopBar);
|
|
|
- cJSON_AddStringToObject(pSubJson,"et",utos);
|
|
|
- //湿度
|
|
|
- cJSON_AddStringToObject(pSubJson,"ah",device_status.humidity);
|
|
|
- //温度
|
|
|
- cJSON_AddStringToObject(pSubJson,"at",device_status.tempture);
|
|
|
- //温控
|
|
|
- rt_sprintf(utos, "%d",device_status.temp_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"tps",utos);
|
|
|
- //光控状态
|
|
|
- rt_sprintf(utos, "%d",device_status.sun_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"lps",utos);
|
|
|
- //雨控状态
|
|
|
- rt_sprintf(utos, "%d",device_status.rain_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"rps",utos);
|
|
|
- //电池状态
|
|
|
- rt_sprintf(utos, "%d",device_status.bat_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"batStatus",utos);
|
|
|
- //灯管状态
|
|
|
- rt_sprintf(utos, "%d",device_status.lamp_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"lamp",utos);
|
|
|
- cJSON_AddStringToObject(pSubJson,"stamp",device_status.stamp); //时间
|
|
|
- cJSON_AddStringToObject(pSubJson,"imei",device_status.imei); //IMEI
|
|
|
- cJSON_AddStringToObject(pSubJson,"iccid",device_status.iccid); //ICCID
|
|
|
- //上仓门状态 1-打开,0-关闭-(通道) 打开为落虫,关闭为排水
|
|
|
- rt_sprintf(utos, "%d",device_status.up_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"upds",utos);
|
|
|
- //下仓门状态 1-打开,0-关闭
|
|
|
- rt_sprintf(utos, "%d",device_status.down_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"dnds",utos);
|
|
|
- //经度
|
|
|
- cJSON_AddStringToObject(pSubJson,"lng",device_status.lng);
|
|
|
- //纬度
|
|
|
- cJSON_AddStringToObject(pSubJson,"lat",device_status.lat);
|
|
|
- //加热仓温度
|
|
|
- rt_sprintf(utos, "%d",device_status.heattem);
|
|
|
- cJSON_AddStringToObject(pSubJson,"hrt",utos);
|
|
|
- //是否为上电开机
|
|
|
- cJSON_AddNumberToObject(pSubJson,"rcnt",device_status.rebootcnt);
|
|
|
- //电流(当前)
|
|
|
- cJSON_AddStringToObject(pSubJson,"current",device_status.power);
|
|
|
- //电压
|
|
|
- cJSON_AddStringToObject(pSubJson,"vbat",device_status.voltage);
|
|
|
- //保险丝电压
|
|
|
- cJSON_AddStringToObject(pSubJson,"fuse_voltage",device_status.fuse_voltage);
|
|
|
- //数据上传间隔
|
|
|
- rt_sprintf(utos, "%d",device_status.dattim);
|
|
|
- cJSON_AddStringToObject(pSubJson,"dat_f",utos);
|
|
|
- //加热状态
|
|
|
- rt_sprintf(utos, "%d",device_status.heat_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"hs",utos);
|
|
|
- //收集时间(参数)
|
|
|
- rt_sprintf(utos, "%d",device_status.clt_time);
|
|
|
- cJSON_AddStringToObject(pSubJson,"collt",utos);
|
|
|
- //加热时间(参数)
|
|
|
- rt_sprintf(utos, "%d",device_status.heattime);
|
|
|
- cJSON_AddStringToObject(pSubJson,"htim",utos);
|
|
|
- //加热温度(参数)
|
|
|
- rt_sprintf(utos, "%d",device_status.heatvalue);
|
|
|
- cJSON_AddStringToObject(pSubJson,"hst",utos);
|
|
|
- //信号强度
|
|
|
- cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
|
|
|
- //高温保护
|
|
|
- rt_sprintf(utos, "%d",device_status.tph);
|
|
|
- cJSON_AddStringToObject(pSubJson,"tph",utos);
|
|
|
- //低温保护
|
|
|
- rt_sprintf(utos, "%d",device_status.tpl);
|
|
|
- cJSON_AddStringToObject(pSubJson,"tpl",utos);
|
|
|
char * p = cJSON_PrintUnformatted(pJsonRoot);
|
|
|
if(NULL == p)
|
|
|
{
|
|
|
@@ -964,7 +999,7 @@ void parseDtu(char *json_string)
|
|
|
}
|
|
|
if(vt!=NULL)
|
|
|
{
|
|
|
- if(atoi(vt->valuestring)>=0&&atoi(vt->valuestring)<=10)
|
|
|
+ if(atoi(vt->valuestring)>=0&&atoi(vt->valuestring)<=100)
|
|
|
{
|
|
|
device_status.version_type = atoi(vt->valuestring);
|
|
|
ef_set_env_blob("version_type", &device_status.version_type, sizeof(device_status.version_type));
|