zhunk il y a 3 mois
Parent
commit
096cd96eed

+ 10 - 5
Application_cbd_apm32f1/applications/control.c

@@ -2117,11 +2117,16 @@ static void Control_Clear_thread_entry(void *parameter)
         if(device_status.update_flag==1) break;
         if(device_status.clear_status==1)
         {
-            if(device_status.version_type==41){
-                ctr_TG_Clear(300);
-            }else {
-                ctr_TG_Clear(350);
-            }
+#if QINGSAO_YUGUAQI == 1
+            ctr_clear(300);
+#else
+        if(device_status.version_type==41){
+            ctr_TG_Clear(300);
+        }else {
+            ctr_TG_Clear(350);
+        }
+#endif
+
             system_status.cleaning_count +=1;   //清扫次数
         }
         if(device_status.clear_status==2)

+ 9 - 3
Application_cbd_apm32f1/applications/control.h

@@ -17,7 +17,7 @@
 
 
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
-#define PCB_V1           1             //1-旧PCB,0-新PCB(模块化)
+#define PCB_V1           0             //1-旧PCB,0-新PCB(模块化)
 #define MATCH_DEVICE     0             //比赛设备1-开启 0-关闭
 #define SENSOR_EN        0             //温湿度:0关闭,1打开
 #define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
@@ -27,7 +27,8 @@
 #define WENKONG          1             //温控功能1-开启 0-关闭
 #define YUKONG           1             //雨控功能1-开启 0-关闭
 #define QIANYA           1             //欠压功能1-开启 0-关闭
-#define JINGJIKUAN       1             //经济款1-开启 0-关闭
+#define JINGJIKUAN       0             //经济款1-开启 0-关闭
+#define QINGSAO_YUGUAQI  1             //雨刮器清扫,带限位:1-开启 0-关闭
 
 #if MATCH_DEVICE == 1
 #define LAMP_CURRENT    600
@@ -41,8 +42,13 @@
 #else
     #define VERSION_HK          "2.41.41(HK)"            //4.0海康-1200W
     #if TG_MODULE == 0
+
 #if JINGJIKUAN == 0
-    #define VERSION_HK_2000W    "2.41.4(2000W)"         //4.0水稻
+#if QINGSAO_YUGUAQI == 1
+    #define VERSION_HK_2000W    "2.42.4(y)"         //4.0水稻
+#else
+        #define VERSION_HK_2000W    "2.41.4(2000W)"         //4.0水稻
+#endif
 #else
     #define VERSION_HK_2000W    "2.45.4(jjk)"           //经济款
 #endif

+ 4 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,7 @@
+# 2026-07-31
+	#if QINGSAO_YUGUAQI == 1
+    #define VERSION_HK_2000W    "2.42.4(y)"         //4.0水稻
+	适配中端款测报灯的雨刮器清扫结构,带限位;
 # 2026-07-29
 	#define VERSION_HK_2000W    "2.43.4(jjk)"           //经济款
 	1、修复触发雨控把接口断电导致无法控制模块;