zhunk 1 year ago
parent
commit
faae7243b9

+ 5 - 1
Application_CBD/applications/control.c

@@ -2570,7 +2570,11 @@ void WorkTask(void)
              {
                  device_status.ctr_up_motor = 1;
              }
-            if(device_status.version_type==4||device_status.version_type==41||strstr(device_status.project,"A7_RTU_V3")!=RT_NULL)
+            if(device_status.version_type==4||
+                    device_status.version_type==41||
+                    device_status.version_type==42||
+                    device_status.version_type==43||
+                    device_status.version_type==12)
             {
                 //震动
                 ctr_shake(ON, device_status.shake_sec);

+ 2 - 4
Application_CBD/applications/dtu_uart2.c

@@ -761,7 +761,7 @@ char * makeJson()
     {
         rt_sprintf(device_status.driver,"%s-%s",VERSION_ZP,device_status.driver_4g);
     }
-    else if (device_status.version_type==4) {
+    else if (device_status.version_type==4|| device_status.version_type==42 ||device_status.version_type==43) {
         rt_sprintf(device_status.driver,"%s-%s",VERSION_HK_2000W,device_status.driver_4g);
     }
     else if (device_status.version_type==41) {
@@ -781,9 +781,7 @@ char * makeJson()
     else if (device_status.version_type==7) {
         rt_sprintf(device_status.driver,"%s-%s",VERSION_BZY,device_status.driver_4g);
     }
-    else if (device_status.version_type==42) {
-        rt_sprintf(device_status.driver,"%s-%s",VERSION_HK_2000W,device_status.driver_4g);
-    }
+
     if(device_status.sensor_485_sta!=0)
     {
         if(strstr(device_status.driver,"485")==RT_NULL)

+ 1 - 1
Application_CBD/applications/hmi.c

@@ -2032,7 +2032,7 @@ void Check_ParamConfig(void)
         {
             rt_sprintf(device_status.driver, "%s",VERSION_GK);
         }
-        else if (device_status.version_type==4)
+        else if (device_status.version_type==4||device_status.version_type==42||device_status.version_type==43)
         {
             rt_sprintf(device_status.driver, "%s",VERSION_HK_2000W);
         }

+ 1 - 0
Application_CBD/readme.md

@@ -4,6 +4,7 @@
 	#define VERSION_ZP          "1.59.1(ZP)"            //1.0转盘
 	#define VERSION_GK          "1.59.1(GK)"            //1.0高空
 	1. 修复雨控的解除时间与预期不符问题;
+	2. 16:48 修复中端款测报灯不展示版本号问题;
 # 2025-08-08 更新说明
 	#define VERSION_HK          "1.58.41(HK)"            //4.0海康-1200W
     #define VERSION_HK_2000W    "1.58.40(2000W)"         //4.0水稻