zhunk пре 3 недеља
родитељ
комит
6d2c0d1d65

+ 4 - 5
Application_cbd_apm32f1/applications/control.h

@@ -34,10 +34,10 @@
 #endif
 ////////////////////////////////////////////////////////////////
 
-#define VERSION_HK          "2.56.41(HK)"            //4.0海康-1200W
+#define VERSION_HK          "2.57.41(HK)"            //4.0海康-1200W
 #if TG_MODULE == 0
     #if JINGJIKUAN == 0
-        #define VERSION_HK_2000W    "2.56.4(2000W)"         //4.0水稻
+        #define VERSION_HK_2000W    "2.57.4(2000W)"         //4.0水稻
     #else
         #define VERSION_HK_2000W    "2.49.4(jjk-5)"           //经济款
     #endif
@@ -50,8 +50,8 @@
 #endif
 
 
-#define VERSION_ZP          "2.56.1(ZP)"            //1.0转盘
-#define VERSION_GK          "2.56.1(GK)"            //1.0高空
+#define VERSION_ZP          "2.57.1(ZP)"            //1.0转盘
+#define VERSION_GK          "2.57.1(GK)"            //1.0高空
 
 extern rt_event_t event_485_play;
 
@@ -169,7 +169,6 @@ typedef struct  _packed
     char net[8];               //网络
     char sim[8];               //SIM卡
     char gps[8];               //定位状态
-    char gps_state[8];         //定位类型
     char tempture[12];         //温度
     char humidity[12];         //湿度
     char driver[64];           //版本

+ 0 - 4
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -3287,12 +3287,8 @@ int parseDtu(char *json_string)
                             rt_sprintf(device_status.gps,"%d",gps_v);
                             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_view  = json_int(gps_view,  device_status.gps_view);
-                                #endif
                                 if(pos_ok)
                                 {
                                     /* 仅在经纬度发生变化时写 Flash */

+ 1 - 1
Application_cbd_apm32f1/applications/hmi.c

@@ -901,7 +901,7 @@ static void refresh_hmi_Component(struct tm tm)
     HMI_WRITE("menu.cam_sta.val=%d",device_status.camsta);
     HMI_WRITE("menu.version.txt=\"%s\"",device_status.driver);
     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_inuse,device_status.gps_view);
     }else if(atoi(device_status.gps)==2){
         HMI_WRITE("menu.gps_state.txt=\"定位成功:(基站)\"");
     }