zhunk vor 3 Wochen
Ursprung
Commit
97df0dd617

+ 6 - 6
Application_CBD/applications/control.h

@@ -35,26 +35,26 @@
     #define VERSION_HK_2000W    "1.3Lv1.40(2000W)"       //水稻
     #define VERSION_HK_2000W    "1.3Lv1.40(2000W)"       //水稻
 #else
 #else
 #if DZ_260630_1 == 0
 #if DZ_260630_1 == 0
-     #define VERSION_HK          "1.82.41(HK)"            //4.0海康-1200W
+     #define VERSION_HK          "1.83.41(HK)"            //4.0海康-1200W
 #else
 #else
-    #define VERSION_HK          "1.82.41(HK-DZ260630_1)"  //4.0海康-1200W
+    #define VERSION_HK          "1.83.41(HK-DZ260630_1)"  //4.0海康-1200W
 #endif
 #endif
 #if DZ_260623_2 == 0
 #if DZ_260623_2 == 0
 #if DZ_260630_1 == 0
 #if DZ_260630_1 == 0
-    #define VERSION_HK_2000W    "1.82.40(2000W)"         //4.0水稻
+    #define VERSION_HK_2000W    "1.83.40(2000W)"         //4.0水稻
 #else
 #else
-    #define VERSION_HK_2000W    "1.82.40(2000W-DZ260630_1)"         //4.0水稻
+    #define VERSION_HK_2000W    "1.83.40(2000W-DZ260630_1)"         //4.0水稻
 #endif
 #endif
 #else
 #else
     #define VERSION_HK_2000W    "DZ_260623_2"         //4.0水稻
     #define VERSION_HK_2000W    "DZ_260623_2"         //4.0水稻
 #endif
 #endif
 #endif
 #endif
 #if DZ_260519 == 0
 #if DZ_260519 == 0
-#define VERSION_ZP          "1.82.1(ZP)"                //1.0转盘
+#define VERSION_ZP          "1.83.1(ZP)"                //1.0转盘
 #else
 #else
 #define VERSION_ZP          "DZ_260519"                 //1.0转盘
 #define VERSION_ZP          "DZ_260519"                 //1.0转盘
 #endif
 #endif
-#define VERSION_GK          "1.82.1(GK)"                //1.0高空
+#define VERSION_GK          "1.83.1(GK)"                //1.0高空
 
 
 #define VERSION_XCT         "1.13.6(HK)"                //吸虫塔-海康
 #define VERSION_XCT         "1.13.6(HK)"                //吸虫塔-海康
 #define VERSION_BZY         "2.70"                      //孢子仪
 #define VERSION_BZY         "2.70"                      //孢子仪

+ 0 - 4
Application_CBD/applications/dtu_uart2.c

@@ -2863,12 +2863,8 @@ int parseDtu(char *json_string)
                           rt_sprintf(device_status.gps,"%d",gps_v);
                           rt_sprintf(device_status.gps,"%d",gps_v);
                           if(gps_v!=0)
                           if(gps_v!=0)
                           {
                           {
-                              #if BOOT_ERR == 1
-                              if(gps_v==1)
-                                  rt_sprintf(device_status.gps_state, "%s","GPS+BD");
                               device_status.gps_inuse = json_int(gps_inuse, device_status.gps_inuse);
                               device_status.gps_inuse = json_int(gps_inuse, device_status.gps_inuse);
                               device_status.gps_view  = json_int(gps_view,  device_status.gps_view);
                               device_status.gps_view  = json_int(gps_view,  device_status.gps_view);
-                              #endif
                               if(pos_ok)
                               if(pos_ok)
                               {
                               {
                                   /* 仅在经纬度发生变化时写 Flash */
                                   /* 仅在经纬度发生变化时写 Flash */

+ 1 - 1
Application_CBD/applications/hmi.c

@@ -904,7 +904,7 @@ static void hmi_refresh_pages(const struct tm *ptm)
     }
     }
 
 
     if(atoi(device_status.gps)==1){
     if(atoi(device_status.gps)==1){
-        HMI_WRITE("menu.gps_state.txt=\"定位成功:(%s)%d/%d\"",device_status.gps_state,device_status.gps_inuse,device_status.gps_view);
+        HMI_WRITE("menu.gps_state.txt=\"定位成功:(GPS+BD)%d/%d\"",device_status.gps_state,device_status.gps_inuse,device_status.gps_view);
     }else if(atoi(device_status.gps)==2){
     }else if(atoi(device_status.gps)==2){
         HMI_WRITE("menu.gps_state.txt=\"定位成功:(基站)\"");
         HMI_WRITE("menu.gps_state.txt=\"定位成功:(基站)\"");
     }
     }

+ 8 - 0
Application_CBD/doc/readme.md

@@ -1,3 +1,11 @@
+# 2026-10-22 更新说明
+			版本:VERSION_HK      1.82.41(HK)     -> 1.83.41(HK)
+		      VERSION_HK_2000W 1.82.40(2000W)  -> 1.83.40(2000W)
+		      VERSION_ZP      1.82.1(ZP)       -> 1.83.1(ZP)
+		      VERSION_GK      1.82.1(GK)       -> 1.83.1(GK)
+		      VERSION_BZY     2.70             -> 2.70
+		      VERSION_XCT     1.13.6(HK)       (吸虫塔未改动,保持不变)
+	1、修复屏幕上GPS定位状态显示的问题;
 # 2026-10-15 更新说明(参数恢复/备份机制修复:盲发缺陷 + 触发条件纠正 + RTU 就绪门控)
 # 2026-10-15 更新说明(参数恢复/备份机制修复:盲发缺陷 + 触发条件纠正 + RTU 就绪门控)
 
 
 		版本:VERSION_HK      1.81.41(HK)     -> 1.82.41(HK)
 		版本:VERSION_HK      1.81.41(HK)     -> 1.82.41(HK)