zhunk 11 bulan lalu
induk
melakukan
d01bb0cd5a

+ 5 - 3
Application_cbd_apm32f1/applications/control.h

@@ -17,7 +17,7 @@
 #define SENSOR_EN        1              //温湿度:0关闭,1打开
 ////////////////////////////////////////////////////////////////
 
-#define VERSION_BZY         "2.6.11"                   //孢子仪
+#define VERSION_BZY         "2.6.12"                   //孢子仪
 
 
 /*********************************************************************/
@@ -114,6 +114,7 @@ typedef struct  _packed
     rt_uint32_t light_over_tim;     //光控定时差秒数,镇流器的结束时间
     rt_uint32_t x_init_dis;         //
     rt_uint32_t y_init_dis;         //
+    rt_uint32_t lux;
     double focus_value;
     int passWord;              //初始密码
     double process;
@@ -128,6 +129,9 @@ typedef struct  _packed
     char gps_state[8];         //定位类型
     char tempture[12];         //温度
     char humidity[12];         //湿度
+    char windspeed[12];        //风速
+    char winddir[12];          //风向
+    char ap[12];               //大气压hpa
     char driver[64];           //版本
     char driver_4g[64];        //4g版本
     char driver_bl[64];        //BL版本
@@ -147,8 +151,6 @@ typedef struct  _packed
     char voltage[6];           //电池电压
     char deviceId[32];         //bdh-设备编码
     char voltage_sun[8];       //太阳能板电压
-    char qianming[128];
-    char photolink[128];        //图片地址
 }Device_Status_typedef;
 
 

+ 10 - 83
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -345,79 +345,6 @@ char *makeJson_Config_BDH(char * deviceId)
     cJSON_Delete(tJsonRoot);
     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()
@@ -569,14 +496,9 @@ char * makeJson()
         rt_kprintf("cJSON pJsonRoot NULL!!!\n");
         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;
     pSubJson = cJSON_CreateObject();
@@ -687,6 +609,12 @@ char * makeJson()
     cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
     cJSON_AddNumberToObject(pSubJson, "x_init_dis", device_status.x_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);
     if(NULL == p)
     {
@@ -1201,7 +1129,7 @@ int parseDtu(char *json_string)
               {
                           datt = cJSON_GetObjectItem(item_ext,"datt");
                           tpl = cJSON_GetObjectItem(item_ext,"tpl");
-
+                          tph = cJSON_GetObjectItem(item_ext,"tph");
                           if(device_status.dtype==3)
                           ds = cJSON_GetObjectItem(item_ext,"ds");
 
@@ -1432,7 +1360,6 @@ int parseDtu(char *json_string)
                                       rt_kprintf("高温保护tph设置失败参数错误!!!\n");
                                   }
                               }
-
                           }
                           if(ds!=NULL)
                           {

+ 36 - 26
Application_cbd_apm32f1/applications/sample_mb_master.c

@@ -12,6 +12,13 @@
 #include <user_mb_app.h>
 #include "control.h"
 #include "hmi.h"
+
+#define DBG_ENABLE
+#define DBG_COLOR
+#define DBG_TAG "modbus"
+#define DBG_LEVEL         DBG_LOG
+#include <rtdbg.h> //must after of DBG_LVL, DBG_TAG or other options
+
 #ifdef PKG_MODBUS_MASTER_SAMPLE
 #define SLAVE_ADDR      MB_SAMPLE_TEST_SLAVE_ADDR
 #define PORT_NUM        MB_MASTER_USING_PORT_NUM
@@ -44,18 +51,8 @@ static void send_thread_entry(void *parameter)
     BOOL IN_3A = 0;           //数据解析方式设置
     eMBMasterReqErrCode error_code = MB_MRE_NO_ERR;
     rt_uint16_t error_count = 0;
-    //USHORT data[3] = {0};
     while (1)
     {
-        /* Test Modbus Master */
-//        data[0] = (USHORT)(rt_tick_get() / 10);
-//        data[1] = (USHORT)(rt_tick_get() % 10);
-//        data[3] = data[1] + 1;
-//        error_code = eMBMasterReqWriteMultipleHoldingRegister(SLAVE_ADDR,          /* salve address */
-//                                                              MB_SEND_REG_START,   /* register start address */
-//                                                              MB_SEND_REG_NUM,     /* register total number */
-//                                                              data,                /* data to be written */
-//                                                              RT_WAITING_FOREVER); /* timeout */
 
         #if 0
         error_code = eMBMasterReqReadInputRegister(SLAVE_ADDR, MB_SEND_REG_START,3,1000);
@@ -80,25 +77,39 @@ static void send_thread_entry(void *parameter)
         }
         #endif
         if(device_status.sensor_485_sta!=200){
-            error_code = eMBMasterReqReadHoldingRegister(SLAVE_ADDR, MB_SEND_REG_START,2,1000);//读多个保持寄存器
-            rt_kprintf("eMBMasterReqReadHoldingRegister: %d \n",error_code);//一直出错,我便把错误返回值打印出来
+
+            error_code = eMBMasterReqReadHoldingRegister(SLAVE_ADDR, MB_SEND_REG_START,11,1000);//读多个保持寄存器
+            // 发送写多个保持寄存器请求
+            //error_code = eMBMasterReqWriteMultipleHoldingRegister(SLAVE_ADDRESS,REGISTER_ADDRESS,REGISTER_COUNT,usDataBuffer,1000);
+            LOG_I("eMBMasterReqReadHoldingRegister: %d \n",error_code);//一直出错,我便把错误返回值打印出来
             if(error_code==0)
             {
                 device_status.sensor_485_sta = 100;
                 error_count = 0;
-                //温度=25并且湿度=30不更新,否则会导致屏幕上显示空
-    //            if((int)usMRegHoldBuf[0][0]/10!=25&&(int)usMRegHoldBuf[0][1]/10!=30)
-    //            {
-                    rt_sprintf(device_status.tempture,"%d.%d",(int)usMRegHoldBuf[0][0]/100, (unsigned int)usMRegHoldBuf[0][0] % 100);
-                    rt_sprintf(device_status.humidity,"%d.%d",(int)usMRegHoldBuf[0][1]/100, (unsigned int)usMRegHoldBuf[0][1] % 100);
-    //                sprintf(device_status.tempture,"%0.01f",(float)usMRegHoldBuf[0][0]/100);
-    //                sprintf(device_status.humidity,"%0.01f",(float)usMRegHoldBuf[0][1]/100);
-    //            }
-                    //rt_thread_delay(1000);
+//                LOG_I("usMRegHoldBuf[0]:%d\n",(int)usMRegHoldBuf[0][0]);    //风速
+//                LOG_I("usMRegHoldBuf[1]:%d\n",(int)usMRegHoldBuf[0][1]);    //风向
+//                LOG_I("usMRegHoldBuf[2]:%d\n",(int)usMRegHoldBuf[0][2]);    //温度
+//                LOG_I("usMRegHoldBuf[3]:%d\n",(int)usMRegHoldBuf[0][3]);    //湿度
+//                LOG_I("usMRegHoldBuf[4]:%d\n",(int)usMRegHoldBuf[0][4]);    //大气压
+//                LOG_I("usMRegHoldBuf[5]:%d\n",(int)usMRegHoldBuf[0][5]);    //滴感式雨量
+//                LOG_I("usMRegHoldBuf[9]:%d\n",(int)usMRegHoldBuf[0][9]);    //照度十位
+//                LOG_I("usMRegHoldBuf[10]:%d\n",(int)usMRegHoldBuf[0][10]);    //照度个位
+
+                device_status.lux = usMRegHoldBuf[0][9] * 10 + usMRegHoldBuf[0][10];
+                rt_sprintf(device_status.windspeed,"%d.%01d",(unsigned int)usMRegHoldBuf[0][0]/100, (unsigned int)usMRegHoldBuf[0][0] % 100);
+                rt_sprintf(device_status.winddir,"%d",(unsigned int)usMRegHoldBuf[0][1]);
+                rt_sprintf(device_status.tempture,"%d.%01d",(int)usMRegHoldBuf[0][2]/10, (unsigned int)usMRegHoldBuf[0][2] % 10);
+                rt_sprintf(device_status.humidity,"%d.%01d",(int)usMRegHoldBuf[0][3]/10, (unsigned int)usMRegHoldBuf[0][3] % 10);
+                rt_sprintf(device_status.ap,"%d",(int)usMRegHoldBuf[0][4]);
+
+
+                LOG_I("风速:%s 风向:%s\n",device_status.windspeed,device_status.winddir);//0代表从机ID=1
+                LOG_I("温度:%s 湿度:%s\n",device_status.tempture,device_status.humidity);//0代表从机ID=1
+                LOG_I("大气压:%s\n",device_status.ap);//0代表从机ID=1
+                LOG_I("光照度:%d\n",device_status.lux);//0代表从机ID=1
             }
         }
-        rt_kprintf("slave data-tem:%d,hum:%d\n",usMRegHoldBuf[0][0],usMRegHoldBuf[0][1]);//0代表从机ID=1
-        rt_kprintf("slave data-tem:%s,hum:%s\n",device_status.tempture,device_status.humidity);//0代表从机ID=1
+
         rt_thread_delay(5000);
         /* Record the number of errors */
         if (error_code != 0)
@@ -117,7 +128,6 @@ static void mb_master_poll(void *parameter)
 {
     eMBMasterInit(MB_RTU, PORT_NUM, PORT_BAUDRATE, PORT_PARITY);
     eMBMasterEnable();
-
     while (1)
     {
         eMBMasterPoll();
@@ -145,7 +155,7 @@ int mb_master_samlpe(void)
         goto __exit;
     }
 
-    tid2 = rt_thread_create("md_m_send", send_thread_entry, RT_NULL, 512, MB_SEND_THREAD_PRIORITY, 10);
+    tid2 = rt_thread_create("md_m_send", send_thread_entry, RT_NULL, 1024, MB_SEND_THREAD_PRIORITY, 10);
     if (tid2 != RT_NULL)
     {
         rt_thread_startup(tid2);
@@ -154,8 +164,8 @@ int mb_master_samlpe(void)
     {
         goto __exit;
     }
-
     is_init = 1;
+    rt_thread_delay(10000);
     return RT_EOK;
 
 __exit:

+ 4 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,7 @@
+# 2025-12-19 更新说明
+	#define VERSION_BZY         "2.6.12"                   //孢子仪
+	修复下发设置tph不解析问题
+	适配五要素气象传感器
 # 2025-12-05 更新说明
 	#define VERSION_BZY         "2.6.11"                   //孢子仪
 	串口解析使用lwjson库

+ 1 - 1
Application_cbd_apm32f1/rtconfig.h

@@ -156,7 +156,7 @@
 #define RT_M_REG_INPUT_START 0
 #define RT_M_REG_INPUT_NREGS 10
 #define RT_M_REG_HOLDING_START 0
-#define RT_M_REG_HOLDING_NREGS 10
+#define RT_M_REG_HOLDING_NREGS 16
 #define RT_M_HD_RESERVE 0
 #define RT_M_IN_RESERVE 4
 #define RT_M_CO_RESERVE 0