|
@@ -91,7 +91,7 @@ void getDeviceInfo(Webs *wp){
|
|
|
cJSON_AddStringToObject(data, "ipAddr", IpAddr);
|
|
|
cJSON_AddStringToObject(data, "netMode", "static");
|
|
|
|
|
|
- pStr = cJSON_Print(root);
|
|
|
+ pStr = cJSON_PrintUnformatted(root);
|
|
|
|
|
|
printf("---> cJSON Str:\n%s\n", pStr);
|
|
|
websSetStatus(wp, 200);
|
|
@@ -151,7 +151,7 @@ void getSysInfo(Webs *wp){
|
|
|
cJSON_AddStringToObject(data, "title", sysInfo.title);
|
|
|
cJSON_AddStringToObject(data, "text", sysInfo.text);
|
|
|
|
|
|
- pStr = cJSON_Print(root);
|
|
|
+ pStr = cJSON_PrintUnformatted(root);
|
|
|
|
|
|
printf("---> cJSON Str:\n%s\n", pStr);
|
|
|
websSetStatus(wp, 200);
|
|
@@ -269,6 +269,7 @@ void getSensorInfo(Webs *wp){
|
|
|
cJSON_AddItemToArray(pJsonArry,pJsonsub=cJSON_CreateObject()); /* 给创建的数组增加对对象*/
|
|
|
//cJSON_AddNumberToObject(pJsonsub, "sensorNum", pSensorBuff->sensor_num);
|
|
|
cJSON_AddStringToObject(pJsonsub, "sensorName", pSensorBuff->sensor_name);
|
|
|
+
|
|
|
//cJSON_AddNumberToObject(pJsonsub, "ownerId", pSensorBuff->owner_id);
|
|
|
//cJSON_AddNumberToObject(pJsonsub, "ownerNun", pSensorBuff->owner_lun);
|
|
|
//cJSON_AddNumberToObject(pJsonsub, "sensorType", pSensorBuff->sensor_type);
|
|
@@ -312,7 +313,7 @@ void getSensorInfo(Webs *wp){
|
|
|
case 0x80: cJSON_AddStringToObject(pJsonsub, "State", "Lower Non-Recoverable"); break;
|
|
|
default: cJSON_AddNumberToObject(pJsonsub, "State", pSensorBuff->sensor_state); break;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
pSensorBuff++;
|
|
|
nSensors--;
|
|
|
}
|