|
@@ -345,79 +345,6 @@ char *makeJson_Config_BDH(char * deviceId)
|
|
|
cJSON_Delete(tJsonRoot);
|
|
cJSON_Delete(tJsonRoot);
|
|
|
return t;
|
|
return t;
|
|
|
}
|
|
}
|
|
|
-//自检应答
|
|
|
|
|
-char *makeJson_selfCheck_(uint8_t sta) //sta==0 应答,sta==1结果
|
|
|
|
|
-{
|
|
|
|
|
- cJSON *pRoot = cJSON_CreateObject();
|
|
|
|
|
- if (pRoot == NULL) {
|
|
|
|
|
- // 错误处理:pRoot 创建失败
|
|
|
|
|
- cJSON_Delete(pRoot);
|
|
|
|
|
- return NULL;
|
|
|
|
|
- }
|
|
|
|
|
- cJSON *pRoot2 = cJSON_CreateObject();
|
|
|
|
|
- if (pRoot2 == NULL) {
|
|
|
|
|
- cJSON_Delete(pRoot2);
|
|
|
|
|
- // 错误处理:pRoot2 创建失败
|
|
|
|
|
- return NULL;
|
|
|
|
|
- }
|
|
|
|
|
- cJSON_AddItemToObject(pRoot, "data", pRoot2);
|
|
|
|
|
-
|
|
|
|
|
- //获取当前时间戳
|
|
|
|
|
- struct timeval tv;
|
|
|
|
|
- gettimeofday(&tv, NULL);
|
|
|
|
|
- if(sta==0)
|
|
|
|
|
- {
|
|
|
|
|
- cJSON_AddItemToObject(pRoot, "msgType", cJSON_CreateString("C6"));
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C601", cJSON_CreateString(device_status.qianming));
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C602", cJSON_CreateNumber(0));
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C603", cJSON_CreateNumber(0));
|
|
|
|
|
- }else {
|
|
|
|
|
- cJSON_AddItemToObject(pRoot, "msgType", cJSON_CreateString("C7"));
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C701", cJSON_CreateString(device_status.qianming));
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C702", cJSON_CreateNumber(device_status.work_status)); //工作状态
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C703", cJSON_CreateNumber(device_status.Power_Type)); //供电类型
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C704", cJSON_CreateNumber(device_status.startBar)); //工作时间点,精确到小时
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C705", cJSON_CreateNumber(device_status.heattem)); //加热仓温度
|
|
|
|
|
- if(device_status.up_status==0){
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C706", cJSON_CreateNumber(1)); //排水状态
|
|
|
|
|
- }else{
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C706", cJSON_CreateNumber(0)); //排水状态
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C707", cJSON_CreateNumber(device_status.sun_status)); //光控状态
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C708", cJSON_CreateNumber(device_status.temp_status)); //低温保护状态
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C709", cJSON_CreateNumber(device_status.timeSwitch)); //工作模式
|
|
|
|
|
- char time_stet[10];
|
|
|
|
|
- sprintf(time_stet,"%d-%d",device_status.startBar,device_status.stopBar);
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C710", cJSON_CreateString(time_stet)); //时控时长
|
|
|
|
|
- char voltage_s[6];
|
|
|
|
|
- rt_sprintf(voltage_s,"%d.%02d",Read_Real_Voltage()/100,Read_Real_Voltage()%100);
|
|
|
|
|
- //f_voltage = (int)(f_voltage * 100 + 0.5) / 100.0f;
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C711", cJSON_CreateNumber(atof(voltage_s))); //电池电压
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C712", cJSON_CreateNumber(0.00)); //太阳能板电压
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C713", cJSON_CreateNumber(atof(device_status.lng))); //经度
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C714", cJSON_CreateNumber(atof(device_status.lat))); //纬度
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C715", cJSON_CreateNumber(device_status.heat_sta)); //加热状态C715
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C716", cJSON_CreateNumber(device_status.led_sta)); //报警状态,太阳能板状态
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C717", cJSON_CreateNumber(0)); //报警状态,太阳能板状态
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C718", cJSON_CreateNumber(device_status.bat_status)); //报警状态,电池状态,C718
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C719", cJSON_CreateNumber(device_status.camsta)); //报警状态,拍照状态C719
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C720", cJSON_CreateString(device_status.photolink)); //原图片地址
|
|
|
|
|
- cJSON_AddItemToObject(pRoot2, "C721", cJSON_CreateNumber(device_status.photo_stamp)); //采集时间戳
|
|
|
|
|
- memset(device_status.qianming,0,sizeof(device_status.qianming));
|
|
|
|
|
- memset(device_status.photolink,0,sizeof(device_status.photolink));
|
|
|
|
|
- }
|
|
|
|
|
- cJSON_AddItemToObject(pRoot, "ts", cJSON_CreateNumber(tv.tv_sec-8*3600));
|
|
|
|
|
- char * t = cJSON_PrintUnformatted(pRoot);
|
|
|
|
|
- if(NULL == t)
|
|
|
|
|
- {
|
|
|
|
|
- cJSON_Delete(pRoot);
|
|
|
|
|
- return NULL;
|
|
|
|
|
- }
|
|
|
|
|
- cJSON_Delete(pRoot);
|
|
|
|
|
- LOG_I("自检JSON:%s",t);
|
|
|
|
|
- return t;
|
|
|
|
|
-}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
char * makeJson_Rtutakephoto()
|
|
char * makeJson_Rtutakephoto()
|
|
@@ -569,14 +496,9 @@ char * makeJson()
|
|
|
rt_kprintf("cJSON pJsonRoot NULL!!!\n");
|
|
rt_kprintf("cJSON pJsonRoot NULL!!!\n");
|
|
|
return NULL;
|
|
return NULL;
|
|
|
}
|
|
}
|
|
|
- if(strstr(device_status.project,"A7_DTU_V3")!=RT_NULL)
|
|
|
|
|
- {
|
|
|
|
|
- cJSON_AddStringToObject(pJsonRoot, "cmd", "read_data");
|
|
|
|
|
- }
|
|
|
|
|
- else
|
|
|
|
|
- {
|
|
|
|
|
- cJSON_AddStringToObject(pJsonRoot, "cmd", "data");
|
|
|
|
|
- }
|
|
|
|
|
|
|
+
|
|
|
|
|
+ cJSON_AddStringToObject(pJsonRoot, "cmd", "data");
|
|
|
|
|
+
|
|
|
|
|
|
|
|
cJSON * pSubJson = NULL;
|
|
cJSON * pSubJson = NULL;
|
|
|
pSubJson = cJSON_CreateObject();
|
|
pSubJson = cJSON_CreateObject();
|
|
@@ -687,6 +609,12 @@ char * makeJson()
|
|
|
cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
|
|
cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
|
|
|
cJSON_AddNumberToObject(pSubJson, "x_init_dis", device_status.x_init_dis);
|
|
cJSON_AddNumberToObject(pSubJson, "x_init_dis", device_status.x_init_dis);
|
|
|
cJSON_AddNumberToObject(pSubJson, "y_init_dis", device_status.y_init_dis);
|
|
cJSON_AddNumberToObject(pSubJson, "y_init_dis", device_status.y_init_dis);
|
|
|
|
|
+ //
|
|
|
|
|
+ cJSON_AddStringToObject(pSubJson, "windspeed", device_status.windspeed);
|
|
|
|
|
+ cJSON_AddStringToObject(pSubJson, "winddir", device_status.winddir);
|
|
|
|
|
+ cJSON_AddStringToObject(pSubJson, "ap", device_status.ap);
|
|
|
|
|
+ rt_sprintf(utos, "%d",device_status.lux);
|
|
|
|
|
+ cJSON_AddNumberToObject(pSubJson, "lux", device_status.lux);
|
|
|
char *p = cJSON_PrintUnformatted(pJsonRoot);
|
|
char *p = cJSON_PrintUnformatted(pJsonRoot);
|
|
|
if(NULL == p)
|
|
if(NULL == p)
|
|
|
{
|
|
{
|
|
@@ -1201,7 +1129,7 @@ int parseDtu(char *json_string)
|
|
|
{
|
|
{
|
|
|
datt = cJSON_GetObjectItem(item_ext,"datt");
|
|
datt = cJSON_GetObjectItem(item_ext,"datt");
|
|
|
tpl = cJSON_GetObjectItem(item_ext,"tpl");
|
|
tpl = cJSON_GetObjectItem(item_ext,"tpl");
|
|
|
-
|
|
|
|
|
|
|
+ tph = cJSON_GetObjectItem(item_ext,"tph");
|
|
|
if(device_status.dtype==3)
|
|
if(device_status.dtype==3)
|
|
|
ds = cJSON_GetObjectItem(item_ext,"ds");
|
|
ds = cJSON_GetObjectItem(item_ext,"ds");
|
|
|
|
|
|
|
@@ -1432,7 +1360,6 @@ int parseDtu(char *json_string)
|
|
|
rt_kprintf("高温保护tph设置失败参数错误!!!\n");
|
|
rt_kprintf("高温保护tph设置失败参数错误!!!\n");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
if(ds!=NULL)
|
|
if(ds!=NULL)
|
|
|
{
|
|
{
|