From d6d0f9b94b8488508f0c8eab0602d9dcfec31505 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 10 四月 2024 10:59:40 +0800
Subject: [PATCH] V1.6，加入心跳包上传sim卡号，心跳包上传防拆跟充电标志。
---
APL/UDPClient.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/APL/UDPClient.c b/APL/UDPClient.c
index dec53ad..8aa8ab1 100644
--- a/APL/UDPClient.c
+++ b/APL/UDPClient.c
@@ -33,7 +33,7 @@
#include "TONE.h"
#include "EC600SFSM.h"
#endif
-
+#include "WS2812.h"
/*******************************************************************************
* Macro *
*******************************************************************************/
@@ -429,10 +429,12 @@
* Modified Date: : 2021年1月9日
*******************************************************************************/
uint8_t heartbeasend_flag = 0,userkey_state4g;
+extern uint32_t uwbled,gpsled,loraled,powerled;
HIDO_INT32 UDPClient_Poll(void)
{
if(Internet_IsIPReady() == HIDO_TRUE)
{
+ loraled=RED;
if(UDP_CLIENT_STATE_IDLE == l_eUDPCLientState)
{
l_eUDPCLientState = UDP_CLIENT_STATE_CONNECTING;
@@ -446,7 +448,7 @@
{
HIDO_UINT32 u32CurTick = HIDO_TimerGetTick();
- if((u32CurTick - l_u32HeartBeatTick) >= 60000)
+ if((u32CurTick - l_u32HeartBeatTick) >= 10000)
{
heartbeasend_flag = 0;
l_u32HeartBeatTick = u32CurTick;
@@ -457,6 +459,7 @@
}
else
{
+ loraled=LEDOFF;
l_eUDPCLientState = UDP_CLIENT_STATE_IDLE;
}
@@ -544,6 +547,7 @@
* Modified Date: : 2021年1月9日
*******************************************************************************/
uint8_t bat_percent2 = 0;
+extern uint8_t input_5v_flag;
//extern qxwz_sdk_config_t sdk_config;
HIDO_INT32 UDPClient_Heartbeat(HIDO_VOID)
{
@@ -553,15 +557,15 @@
{
if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
{ u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,3:%d.%d.%d.%d:%d.",
- g_com_map[DEV_ID], bat_percent2, 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]);
+ 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_percent2, 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]);
+ 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.",
- g_com_map[DEV_ID], bat_percent2, 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]);
+ 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]);
}
Socket_Send(l_i32UDPCLientID, (HIDO_UINT8 *)l_au8CmdBuff, u32Len);
}
--
Gitblit v1.9.3