zhunk hai 1 ano
pai
achega
a724dc90ff

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

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

+ 7 - 0
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -1029,7 +1029,14 @@ char * makeJson()
     else if (device_status.version_type==6) {   //吸虫塔
         rt_sprintf(utos,"6");
         cJSON_AddStringToObject(pSubJson,"vtype",utos);
+    }else if (device_status.version_type==42) {   //吸虫塔
+        rt_sprintf(utos,"42");
+        cJSON_AddStringToObject(pSubJson,"vtype",utos);
+    }else if (device_status.version_type==43) {   //吸虫塔
+        rt_sprintf(utos,"43");
+        cJSON_AddStringToObject(pSubJson,"vtype",utos);
     }
+
     if(device_status.version_type!=6&&device_status.dtype!=7)
     {
         //光控定时

+ 2 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,5 @@
+#define VERSION_HK_2000W    "2.31.4(2000W)"         //4.0水稻 
+	修复中端款V43不上传vtype字段
 #define VERSION_HK_2000W    "2.30.4(2000W)"         //4.0水稻 
 	震动的模式修改,基准时间50s,间隔1000ms;
 #define VERSION_HK_2000W    "2.29.4(2000W)"         //4.0水稻