zhunk 1 سال پیش
والد
کامیت
5edfd84916

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -23,7 +23,7 @@
     #define VERSION_HK_2000W    "1.3led.40(2000W)"       //水稻
     #define VERSION_HK_2000W    "1.3led.40(2000W)"       //水稻
 #else
 #else
     #define VERSION_HK          "2.5.41(HK)"            //4.0海康-1200W
     #define VERSION_HK          "2.5.41(HK)"            //4.0海康-1200W
-    #define VERSION_HK_2000W    "2.13.4(2000W)"         //4.0水稻
+    #define VERSION_HK_2000W    "2.14.4(2000W)"         //4.0水稻
 #endif
 #endif
 
 
 #define VERSION_ZP          "1.45.1(ZP)"            //1.0转盘
 #define VERSION_ZP          "1.45.1(ZP)"            //1.0转盘

+ 5 - 2
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -447,6 +447,7 @@ static void dtu_thread_entry_send(void *parameter)
     device_status.num_updata = 0;
     device_status.num_updata = 0;
     static uint16_t current_arry[10];
     static uint16_t current_arry[10];
     static uint8_t record_current = 0;
     static uint8_t record_current = 0;
+    static uint8_t lamp_sta_cnt = 0;
     rt_thread_delay(10000);
     rt_thread_delay(10000);
     static rt_uint16_t wait_i = 0;
     static rt_uint16_t wait_i = 0;
     static rt_uint8_t check_i = 0;
     static rt_uint8_t check_i = 0;
@@ -505,7 +506,7 @@ static void dtu_thread_entry_send(void *parameter)
                     ctr_RTU_DTU(ON);
                     ctr_RTU_DTU(ON);
                     power_i = 0;
                     power_i = 0;
                 }
                 }
-                if(device_status.work_status==1&&device_status.num_updata%5==0&&atoi(device_status.power)>20)    //每过5S把电流值存入数组,连续10条数据的电流值大于400mA判断为正常
+                if(device_status.work_status==1&&device_status.num_updata%10==0&&atoi(device_status.power)>20)    //每过10S把电流值存入数组,连续10条数据的电流值大于400mA判断为正常
                 {
                 {
                     current_arry[record_current] = atoi(device_status.power);
                     current_arry[record_current] = atoi(device_status.power);
                     record_current++;
                     record_current++;
@@ -515,11 +516,13 @@ static void dtu_thread_entry_send(void *parameter)
                         if(hasElementGreaterThan400(current_arry, 10)==0)   //连续10条电流值大于400,灯管状态正常
                         if(hasElementGreaterThan400(current_arry, 10)==0)   //连续10条电流值大于400,灯管状态正常
                         {
                         {
                             device_status.lamp_status = 0;
                             device_status.lamp_status = 0;
+                            lamp_sta_cnt = 0;
                         }
                         }
                         if(hasElementGreater_lessThan400(current_arry,10)==0)   //连续10条电流值小于400,灯管状态异常
                         if(hasElementGreater_lessThan400(current_arry,10)==0)   //连续10条电流值小于400,灯管状态异常
                         {
                         {
-                            device_status.lamp_status = 1;
+                            lamp_sta_cnt++;
                         }
                         }
+                        if(lamp_sta_cnt>=3) device_status.lamp_status = 1;
                         memset(current_arry,0,sizeof(current_arry));
                         memset(current_arry,0,sizeof(current_arry));
                     }
                     }
                 }
                 }

+ 2 - 0
Application_cbd_apm32f1/readme.md

@@ -1,4 +1,6 @@
 # 2025-05-21 更新说明
 # 2025-05-21 更新说明
+#define VERSION_HK_2000W    "2.14.4(2000W)"         //4.0水稻
+1. 改进灯管检测,增加检测次数及检测间隔,提高准确度;
 #define VERSION_HK_2000W    "2.13.4(2000W)"         //4.0水稻
 #define VERSION_HK_2000W    "2.13.4(2000W)"         //4.0水稻
 1. 修改温湿度设置时间方法
 1. 修改温湿度设置时间方法
 # 2025-05-19 更新说明
 # 2025-05-19 更新说明