yf_zjb 5 éve
szülő
commit
7a0c18b97e

+ 3 - 3
Application_CBD/applications/control.h

@@ -13,10 +13,10 @@
 #include <board.h>
 
 #include <rtdevice.h>
-#define VERSION_HK "1.8.41(HK)"         //版本
-#define VERSION_ZP "1.8.1(ZP)"         //版本
+#define VERSION_HK "1.9.41(HK)"         //版本
+#define VERSION_ZP "1.9.1(ZP)"         //版本
 
-#define CompileTime "20210408"
+#define CompileTime "20210409"
 
 /*******************************测试任务****************************************/
 /*********************************************************************/

+ 62 - 26
Application_CBD/applications/dtu_uart2.c

@@ -411,37 +411,58 @@ char * makeJson()
     //震动时间
     rt_sprintf(utos, "%d",device_status.shake_sec);
     cJSON_AddStringToObject(pSubJson,"shake_sec",utos);
+
     cJSON_AddStringToObject(pSubJson,"gps",device_status.gps);              //定位状态
-    cJSON_AddNumberToObject(pSubJson,"ws",device_status.work_status);       //工作状态
-    cJSON_AddNumberToObject(pSubJson,"ds",device_status.ds);                //工作状态
-    cJSON_AddNumberToObject(pSubJson,"ts",device_status.timeSwitch);        //定时模式
+    //工作状态
+    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);
     //开始时间
-    cJSON_AddNumberToObject(pSubJson,"st",device_status.startBar);
+    rt_sprintf(utos, "%d",device_status.startBar);
+    cJSON_AddStringToObject(pSubJson,"st",utos);
     //结束时间
-    cJSON_AddNumberToObject(pSubJson,"et",device_status.stopBar);
+    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);
-    cJSON_AddNumberToObject(pSubJson,"tps",device_status.temp_status);      //温控
-    cJSON_AddNumberToObject(pSubJson,"lps",device_status.sun_status);       //光控状态
-    cJSON_AddNumberToObject(pSubJson,"rps",device_status.rain_status);      //雨控状态
-    cJSON_AddNumberToObject(pSubJson,"batStatus",device_status.bat_status); //电池状态
-    cJSON_AddNumberToObject(pSubJson,"lamp",device_status.lamp_status);     //灯管状态
+    //温控
+    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-关闭-(通道) 打开为落虫,关闭为排水
-    cJSON_AddNumberToObject(pSubJson,"upds",device_status.up_status);
+    rt_sprintf(utos, "%d",device_status.up_status);
+    cJSON_AddStringToObject(pSubJson,"upds",utos);
     //下仓门状态 1-打开,0-关闭
-
-    cJSON_AddNumberToObject(pSubJson,"dnds",device_status.down_status);
+    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);
     //加热仓温度
-    cJSON_AddNumberToObject(pSubJson,"hrt",device_status.heattem);
+    rt_sprintf(utos, "%d",device_status.heattem);
+    cJSON_AddStringToObject(pSubJson,"hrt",utos);
     //是否为上电开机
     cJSON_AddNumberToObject(pSubJson,"rcnt",device_status.rebootcnt);
     //电流(当前)
@@ -451,22 +472,28 @@ char * makeJson()
     //保险丝电压
     cJSON_AddStringToObject(pSubJson,"fuse_voltage",device_status.fuse_voltage);
     //数据上传间隔
-    cJSON_AddNumberToObject(pSubJson,"dat_f",device_status.dattim);
+    rt_sprintf(utos, "%d",device_status.dattim);
+    cJSON_AddStringToObject(pSubJson,"dat_f",utos);
     //加热状态
-    cJSON_AddNumberToObject(pSubJson,"hs",device_status.heat_status);
+    rt_sprintf(utos, "%d",device_status.heat_status);
+    cJSON_AddStringToObject(pSubJson,"hs",utos);
     //收集时间(参数)
-
-    cJSON_AddNumberToObject(pSubJson,"collt",device_status.clt_time);
+    rt_sprintf(utos, "%d",device_status.clt_time);
+    cJSON_AddStringToObject(pSubJson,"collt",utos);
     //加热时间(参数)
-    cJSON_AddNumberToObject(pSubJson,"htim",device_status.heattime);
+    rt_sprintf(utos, "%d",device_status.heattime);
+    cJSON_AddStringToObject(pSubJson,"htim",utos);
     //加热温度(参数)
-    cJSON_AddNumberToObject(pSubJson,"hst",device_status.heatvalue);
+    rt_sprintf(utos, "%d",device_status.heatvalue);
+    cJSON_AddStringToObject(pSubJson,"hst",utos);
     //信号强度
     cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
     //高温保护
-    cJSON_AddNumberToObject(pSubJson,"tph",device_status.tph);
+    rt_sprintf(utos, "%d",device_status.tph);
+    cJSON_AddStringToObject(pSubJson,"tph",utos);
     //低温保护
-    cJSON_AddNumberToObject(pSubJson,"tpl",device_status.tpl);
+    rt_sprintf(utos, "%d",device_status.tpl);
+    cJSON_AddStringToObject(pSubJson,"tpl",utos);
     char * p = cJSON_PrintUnformatted(pJsonRoot);
     if(NULL == p)
     {
@@ -666,23 +693,32 @@ void parseDtu(char *json_string)
                       }
                       rt_kprintf("参数同步:\nlat:%s\nlng:%s\n",lat->valuestring,lng->valuestring);
                   //CSQ
-                  if(csq->valuestring!=NULL&&sizeof(csq->valuestring)<3)
+                  if(csq!=NULL&&atoi(csq->valuestring)>=0&&atoi(csq->valuestring)<=31)
                   {
                       rt_sprintf(device_status.csq,"%s",csq->valuestring);
                   }
+                  else {
+                      rt_sprintf(device_status.csq,"0");
+                  }
                   //NET
-                  if (net!=NULL&&sizeof(net->valuestring)<2)
+                  if (net!=NULL&&atoi(net->valuestring)>=0&&atoi(net->valuestring)<=1)
                   {
                       rt_kprintf("网络状态:%s\n",net->valuestring);
                       rt_sprintf(device_status.net,"%s",net->valuestring);
                   }
+                  else {
+                      rt_sprintf(device_status.net,"1");
+                  }
                   //SIM
-                  if (sim!=NULL&&sizeof(net->valuestring)<2)
+                  if (sim!=NULL&&atoi(sim->valuestring)>=0&&atoi(sim->valuestring)<=1)
                   {
                       rt_sprintf(device_status.sim,"%s",sim->valuestring);
                   }
+                  else {
+                      rt_sprintf(device_status.sim,"1");
+                  }
                   //GPS
-                  if (gps!=NULL&&sizeof(gps->valuestring)<2)
+                  if (gps!=NULL&&atoi(gps->valuestring)>=0&&atoi(gps->valuestring)<=3)
                   {
                       rt_sprintf(device_status.gps,"%s",gps->valuestring);
                       if(atoi(gps->valuestring)!=0)

+ 4 - 2
Application_CBD/readme.md

@@ -79,8 +79,10 @@ void ymodem_ota(uint8_t argc, char **argv)
 {"cmd": "GetInfo"}>>>>={"uart": "getinfo"}
 同步消息:
 	csq->valueint-----csq->valuestring
-	
-
+	net
+	sim
+## 2021-04-09-版本:1.9.41(HK)
+- 数据上传下发字段改为字符串