From 802d577c38746ffd416d86d8a54ab0a5ad618089 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 11 六月 2024 11:42:58 +0800
Subject: [PATCH] 铁鞋2.8,加入了充电时候如果没有测距30s重启的机制

---
 APL/UDPClient.c |   43 +++++++++++++++++++++++++++++++++----------
 1 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/APL/UDPClient.c b/APL/UDPClient.c
index 8aa8ab1..90c2457 100644
--- a/APL/UDPClient.c
+++ b/APL/UDPClient.c
@@ -430,6 +430,9 @@
  *******************************************************************************/
 uint8_t heartbeasend_flag = 0,userkey_state4g;
 extern uint32_t uwbled,gpsled,loraled,powerled;
+extern uint8_t fangchai_flag;
+extern uint8_t nomove_flag;
+extern uint8_t zuihoufasong_falg;
 HIDO_INT32 UDPClient_Poll(void)
 {
     if(Internet_IsIPReady() == HIDO_TRUE)
@@ -443,17 +446,36 @@
                     g_com_map[IP_0], g_com_map[IP_1], g_com_map[IP_2], g_com_map[IP_3]);
 
             Socket_Connect(l_i32UDPCLientID, (HIDO_CHAR *)l_au8CmdBuff, g_com_map[PORT]);
+            
+//                        HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "%u.%u.%u.%u",
+//                    39, 105, 162, 230);
+
+//            Socket_Connect(l_i32UDPCLientID, (HIDO_CHAR *)l_au8CmdBuff, 8999);
         }
         else if(UDP_CLIENT_STATE_CONNECTED == l_eUDPCLientState)
         {
             HIDO_UINT32 u32CurTick =  HIDO_TimerGetTick();
-
-            if((u32CurTick - l_u32HeartBeatTick) >= 10000)
+            if(fangchai_flag==0)
             {
-                heartbeasend_flag = 0;
-                l_u32HeartBeatTick = u32CurTick;
-                UDPClient_Heartbeat();
-                userkey_state4g = 0;
+                if((u32CurTick - l_u32HeartBeatTick) >= 10000)
+                {
+                    heartbeasend_flag = 0;
+                    l_u32HeartBeatTick = u32CurTick;
+                    UDPClient_Heartbeat();
+//                    if(nomove_flag==1)
+//                    {zuihoufasong_falg=1;}
+                    userkey_state4g = 0;
+                }
+            }
+            else            
+            {
+                if((u32CurTick - l_u32HeartBeatTick) >= 1000)
+                {
+                    heartbeasend_flag = 0;
+                    l_u32HeartBeatTick = u32CurTick;
+                    UDPClient_Heartbeat();
+                    userkey_state4g = 0;
+                }
             }
         }
     }
@@ -548,6 +570,7 @@
  *******************************************************************************/
 uint8_t bat_percent2 = 0;
 extern uint8_t input_5v_flag;
+extern uint8_t nomove_flag;
 //extern qxwz_sdk_config_t sdk_config;
 HIDO_INT32 UDPClient_Heartbeat(HIDO_VOID)
 {
@@ -560,12 +583,12 @@
                     g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),userkey_state4g,g_com_map[TCP_IP_0],g_com_map[TCP_IP_1],g_com_map[TCP_IP_2],g_com_map[TCP_IP_3],g_com_map[TCP_PORT]);
     }else if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NTRIP)
     {
-          u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,2%s %s",
-                    g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),userkey_state4g,(char *)&g_com_map[NTRIP_HOST_INDEX],(char *)&g_com_map[NTRIP_USERNANME_INDEX]);    
+//          u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,2%s %s",
+//                    g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),userkey_state4g,(char *)&g_com_map[NTRIP_HOST_INDEX],(char *)&g_com_map[NTRIP_USERNANME_INDEX]);    
      }else if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NONE)
     {
-         u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,1.,%d,%d",
-                    g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),userkey_state4g,input_5v_flag,fangchai_flag,g_com_map[TCP_IP_0],g_com_map[TCP_IP_1],g_com_map[TCP_IP_2],g_com_map[TCP_IP_3],g_com_map[TCP_PORT]);   
+         u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,1.,%d,%d,%d",
+                    g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),userkey_state4g,input_5v_flag,fangchai_flag,nomove_flag,g_com_map[TCP_IP_0],g_com_map[TCP_IP_1],g_com_map[TCP_IP_2],g_com_map[TCP_IP_3],g_com_map[TCP_PORT]);   
     }      
         Socket_Send(l_i32UDPCLientID, (HIDO_UINT8 *)l_au8CmdBuff, u32Len);
     }

--
Gitblit v1.9.3