zhunk 1 год назад
Родитель
Сommit
7e6d16e65a

Разница между файлами не показана из-за своего большого размера
+ 248 - 253
Application_cbd_apm32f1/.cproject


+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -17,7 +17,7 @@
 #define SENSOR_EN        0              //温湿度:0关闭,1打开
 ////////////////////////////////////////////////////////////////
 
-#define VERSION_BZY         "2.4.2"                   //孢子仪
+#define VERSION_BZY         "2.4.4"                   //孢子仪
 
 
 /*********************************************************************/

+ 61 - 19
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -118,8 +118,65 @@ static rt_err_t dtu_input(rt_device_t dev, rt_size_t size)
     return result;
 }
 
+static void dtu_thread_entry_recv(void *parameter)
+{
+    struct rx_msg msg;
+    rt_memset(&msg, 0, sizeof(msg));
+
+    rt_err_t result;
+    rt_uint32_t rx_length;
+    static char accum_buf[1024] = {0};  // 累积缓冲区(根据实际数据量调整)
+    static size_t accum_len = 0;        // 累积缓冲区当前长度
+
+    while (1) {
+        result = rt_mq_recv(&rx_mq_dtu, &msg, sizeof(struct rx_msg), 50);
+        if (result == RT_EOK) {
+            // 计算实际可读取的缓冲区长度(避免溢出)
+            rx_length = (sizeof(accum_buf) - 1 > msg.size) ? msg.size : (sizeof(accum_buf) - 1 - accum_len);
+            if (rx_length <= 0) {
+                LOG_W("累积缓冲区已满,丢弃新数据!");
+                continue;
+            }
 
+            // 读取串口数据并追加到累积缓冲区
+            rx_length = rt_device_read(msg.dev, 0, accum_buf + accum_len, rx_length);
+            if (rx_length > 0) {
+                accum_len += rx_length;
+                accum_buf[accum_len] = '\0';  // 方便打印
+                LOG_D("累积接收数据: %s", accum_buf);
+            }
 
+            // 查找并解析完整的 JSON 数据包
+            char *json_start = strchr(accum_buf, '{');
+            if (json_start != NULL) {
+                char *json_end = strrchr(json_start, '}');
+                if (json_end != NULL) {
+                    size_t json_len = json_end - json_start + 1;
+                    char json_data[json_len + 1];
+                    memcpy(json_data, json_start, json_len);
+                    json_data[json_len] = '\0';
+
+                    // 解析 JSON(确保 parseDtu 能处理完整数据)
+                    parseDtu(json_data);
+
+                    // 截断累积缓冲区,保留剩余数据
+                    size_t remaining_len = accum_len - (json_end - accum_buf + 1);
+                    if (remaining_len > 0) {
+                        memmove(accum_buf, json_end + 1, remaining_len);
+                        accum_len = remaining_len;
+                        accum_buf[accum_len] = '\0';
+                    } else {
+                        accum_len = 0;  // 无剩余数据,清空缓冲区
+                    }
+                }
+            }
+
+            // 其他逻辑(如状态标记)
+            device_status.C01 &= ~(1 << 13);  // 通信正常
+        }
+    }
+}
+#if 0
 static void dtu_thread_entry_recv(void *parameter)
 {
     struct rx_msg msg;
@@ -127,7 +184,6 @@ static void dtu_thread_entry_recv(void *parameter)
 
     rt_err_t result;
     rt_uint32_t rx_length;
-    rt_uint32_t rx_err = 0;
     static char str_check[2]={'{','}'};
     static char rx_buffer[512];
     static char rx_buffer_tmp[512];
@@ -138,8 +194,6 @@ static void dtu_thread_entry_recv(void *parameter)
         #if 1
         if(result == RT_EOK)
         {
-
-            rx_err = 0;
             rx_length =(sizeof(rx_buffer) - 1) > msg.size ?
                     msg.size : sizeof(rx_buffer) - 1;
             rx_length = rt_device_read(msg.dev, 0, &rx_buffer[0], rx_length);
@@ -182,25 +236,10 @@ static void dtu_thread_entry_recv(void *parameter)
                  }
 
          }
-        else {
-               rx_err ++;
-               if(rx_err==54000)//90分钟未接收到数据
-               {
-                    ctr_RTU_DTU(OFF);
-                    device_status.C01 |= (1<<13);    //灯管 故障
-               }
-               else if (rx_err>54100&&device_status.bat_status==0)
-               {
-                   LOG_W("通信中断,RTU重新上电");
-                   rx_err = 0;
-                   ctr_RTU_DTU(ON);
-                   ctr_photo(ON);
-               }
-         }
    }
         #endif
 }
-
+#endif
 /* 创建线程 */
 int dtu_data_play(void)
 {
@@ -647,6 +686,9 @@ char * makeJson()
     //开关状态
     rt_sprintf(utos, "%d",device_status.ds);
     cJSON_AddStringToObject(pSubJson,"ds",utos);
+    //箱内温度
+    rt_sprintf(utos, "%d",device_status.heattem);
+    cJSON_AddStringToObject(pSubJson,"boxtem",utos);
     //湿度
     cJSON_AddStringToObject(pSubJson,"ah",device_status.humidity);
     //温度

+ 8 - 2
Application_cbd_apm32f1/applications/sht30_collect.c

@@ -145,8 +145,6 @@ int UART_485_INIT(void)
 /* 入口函数 */
 static void sht30_collect_thread_entry(void *parameter)
 {
-    static int checklightnum = 0;
-    static int checknightnum = 0;
     while (1)
     {
         //温控
@@ -229,6 +227,14 @@ static void Power_ReadCheck(void *parameter)
         sprintf(device_status.voltage,"%.2f",(float)(moving_average_filter_update(filter_v, (float)Read_Real_Voltage()/100)));
         //LOG_D("voltage is:%sV",device_status.voltage);
         sprintf(device_status.fuse_voltage, "%d.%02d",Read_Fuse_Voltage()/100,Read_Fuse_Voltage()%100);
+        RV = 10000 * (4096 - Read_Ntc_Voltage()) / Read_Ntc_Voltage();
+        if(TempCalculate(RV, 3950, 10000)-TempCalculate(RV, 3950, 10000)>10)
+        {
+            LOG_E("TempCalculate Error!");
+        }else {
+            device_status.heattem = TempCalculate(RV, 3950, 10000);
+        }
+
         #endif
         rt_thread_mdelay(10);
     }

+ 10 - 0
Application_cbd_apm32f1/packages/syswatch-latest/src/syswatch.c

@@ -374,6 +374,7 @@ static void syswatch_fsm(void)
 
 static void syswatch_thread_entry(void *parameter)
 {
+    static struct tm alarm_new;
     if (syswatch_wdt_startup() != RT_EOK)
     {
         LOG_E("watch dog startup fail");
@@ -387,6 +388,15 @@ static void syswatch_thread_entry(void *parameter)
     
     while(1)
     {
+        time_t now;
+        time(&now);
+        alarm_new =*localtime(&now);
+        if((alarm_new.tm_hour)==9&&(alarm_new.tm_min==00)&&(alarm_new.tm_sec==0))
+        {
+            #if 1
+            rt_hw_cpu_reset();
+            #endif
+        }
         rt_thread_delay(RT_TICK_PER_SECOND);
         syswatch_wdt_feed();
         syswatch_fsm();

+ 7 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,10 @@
+# 2025-09-15 更新说明
+	#define VERSION_BZY         "2.4.4"                   //孢子仪
+	1、DTU串口通信接收逻辑改进;
+# 2025-09-09 更新说明
+	#define VERSION_BZY         "2.4.3"                   //孢子仪
+	1、增加定时重启,9:00
+	2、修复串口通信异常处理的逻辑Bug
 # 2025-09-02 更新说明
 #define VERSION_BZY         "2.4.2"                   //孢子仪
 1. 修复采集时间的分钟设置;