zhunk 1 месяц назад
Родитель
Сommit
87892c0bf3

+ 4 - 2
Application_CBD/applications/control.h

@@ -15,7 +15,7 @@
 #include <rtdevice.h>
 //定制相关//////////////////////////////////////////////////////
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
-#define SENSOR_EN        0              //温湿度:0关闭,1打开
+#define SENSOR_EN        1              //温湿度:0关闭,1打开
 #define ROBOT_EN         0              //机器人
 #define Color_EN         0              //定制色诱
 #define DZ_250723        0              //触发雨控后隔天再解除
@@ -53,7 +53,6 @@
 #define VERSION_Robot       "1.0(robot)"                //展厅机器人
 #define VERSION_BZY         "2.60"                      //孢子仪
 
-
 #define CompileTime         sprintf(device_status.driver_compile,"%s-%s",__DATE__,__TIME__)              //编译时间,每次更新代码修改
 /*********************************************************************/
 typedef struct  _packed
@@ -161,8 +160,11 @@ typedef struct  _packed
     char sim[8];               //SIM卡
     char gps[8];               //定位类型
     char gps_state[8];         //定位类型
+    char wind_speed[12];       //风速m/s
+    char wind_dir[12];         //风向
     char tempture[12];         //温度
     char humidity[12];         //湿度
+    char rain[12];             //雨量mm/min
     char lux[12];              //照度Lux
     char ap[12];               //大气压hpa
     char driver[64];           //版本

+ 10 - 1
Application_CBD/applications/dtu_uart2.c

@@ -1255,7 +1255,16 @@ char * makeJson()
         rt_sprintf(utos,"43");
         cJSON_AddStringToObject(pSubJson,"vtype",utos);
     }
-
+#if SENSOR_EN == 1
+    cJSON * sensorJson =cJSON_CreateObject();
+    cJSON_AddItemToObject(pJsonRoot, "sensor", sensorJson);
+    cJSON_AddStringToObject(sensorJson,"temp",device_status.tempture);
+    cJSON_AddStringToObject(sensorJson,"humidity",device_status.humidity);
+    cJSON_AddStringToObject(sensorJson,"rain",device_status.rain);
+    cJSON_AddStringToObject(sensorJson,"wind_speed",device_status.wind_speed);
+    cJSON_AddStringToObject(sensorJson,"wind_dir",device_status.wind_dir);
+    cJSON_AddStringToObject(sensorJson,"ap",device_status.ap);
+#endif
     if(device_status.version_type!=6&&device_status.dtype!=7)
     {
         //光控定时

+ 20 - 0
Application_CBD/applications/sample_mb_master.c

@@ -109,6 +109,7 @@ static void send_thread_entry(void *parameter)
 //                    rt_sprintf(device_status.humidity,"%d.%d",(int)usMRegHoldBuf[0][1]/10, (uint)usMRegHoldBuf[0][1] % 10);
 //                    rt_sprintf(device_status.lux,"%d",((int)usMRegHoldBuf[0][2]*10+(int)usMRegHoldBuf[0][3]));
 //                    rt_kprintf("照度:%s Lux\n",device_status.lux);
+#if 0
                     rt_kprintf("usMRegHoldBuf[0]:%d\n",(int)usMRegHoldBuf[0][0]);
                     rt_kprintf("usMRegHoldBuf[1]:%d\n",(int)usMRegHoldBuf[0][1]);
                     rt_kprintf("usMRegHoldBuf[2]:%d\n",(int)usMRegHoldBuf[0][2]);
@@ -121,6 +122,25 @@ static void send_thread_entry(void *parameter)
                     rt_sprintf(device_status.ap,"%d.%d",(int)usMRegHoldBuf[0][4]/10, (uint)usMRegHoldBuf[0][4] % 10); //    大气压
                     rt_sprintf(device_status.lux,"%d",(int)usMRegHoldBuf[0][5]*10+(int)usMRegHoldBuf[0][6]); //    照度
                     rt_kprintf("大气压:%s 照度:%s\n",device_status.ap,device_status.lux);//0代表从机ID=1
+#else
+                    rt_kprintf("usMRegHoldBuf[0]:%d\n",(int)usMRegHoldBuf[0][0]);
+                    rt_kprintf("usMRegHoldBuf[1]:%d\n",(int)usMRegHoldBuf[0][1]);
+                    rt_kprintf("usMRegHoldBuf[2]:%d\n",(int)usMRegHoldBuf[0][2]);
+                    rt_kprintf("usMRegHoldBuf[3]:%d\n",(int)usMRegHoldBuf[0][3]);
+                    rt_kprintf("usMRegHoldBuf[4]:%d\n",(int)usMRegHoldBuf[0][4]);
+                    rt_kprintf("usMRegHoldBuf[5]:%d\n",(int)usMRegHoldBuf[0][5]);
+                    rt_kprintf("usMRegHoldBuf[6]:%d\n",(int)usMRegHoldBuf[0][6]);
+                    rt_sprintf(device_status.wind_speed,"%0.01f",(float)usMRegHoldBuf[0][0]/100);
+                    rt_sprintf(device_status.wind_dir,"%d",(int)usMRegHoldBuf[0][1]);
+                    rt_sprintf(device_status.tempture,"%d.%d",(int)usMRegHoldBuf[0][2]/10, (uint)usMRegHoldBuf[0][2] % 10);
+                    rt_sprintf(device_status.humidity,"%d.%d",(int)usMRegHoldBuf[0][3]/10, (uint)usMRegHoldBuf[0][3] % 10);
+                    rt_sprintf(device_status.ap,"%d.%d",(int)usMRegHoldBuf[0][4]/10, (uint)usMRegHoldBuf[0][4] % 10); //    大气压
+                    //滴感式雨量
+                    rt_sprintf(device_status.rain,"%d.%02d",(int)usMRegHoldBuf[0][5]/10, (uint)usMRegHoldBuf[0][5] % 10); //    雨量0.03mm/min
+                    rt_kprintf("风速:%s m/s 风向:%s ° \n",device_status.wind_speed,device_status.wind_dir); //风速:0.01m/s
+                    rt_kprintf("温度:%s 湿度:%s 雨量:%s mm/min\n",device_status.tempture,device_status.humidity,device_status.rain);
+                    rt_kprintf("雨量:%s mm/min\n",device_status.rain);  
+#endif
     //                sprintf(device_status.tempture,"%0.01f",(float)usMRegHoldBuf[0][0]/100);
     //                sprintf(device_status.humidity,"%0.01f",(float)usMRegHoldBuf[0][1]/100);
     //            }