ChinaUWBProject.git

			@@ -21,6 +21,7 @@
			#include "mk_trace.h"
			#include "dw_app_anchor.h"
			#include "PCA9555.h"
			#include "WS2812.h"
			/*******************************************************************************
			* Macro *
			*******************************************************************************/
			@@ -39,7 +40,7 @@
			* Local Variable *
			*******************************************************************************/
			HIDO_INT32 l_i32TCPClientID = 0;
			extern uint8_t gps_power_state;
			uint8_t gps_power_state;
			static E_TCPClientState l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
			static HIDO_UINT32 l_u32HeartBeatTick = 0;
			static HIDO_UINT8 l_au8CmdBuff[1024];
			@@ -268,8 +269,12 @@
			uint8_t alarm_type;
			extern double jd,wd;
			extern int32_t distance;
			extern uint8_t GPS_GGAmessage[150],userkey_state,gps_timeout_flag;
			extern uint16_t g_spsum,g_snum,ave_sp;
			extern uint8_t userkey_state;
			uint8_t gps_timeout_flag;
			extern uint8_t GPS_GGAmessage[150];
			uint16_t g_spsum,g_snum,ave_sp;
			extern uint8_t GPS_ParseGGA_data[256];
			extern uint8_t GPS_ParseGGA_changdu;
			void UDPClient_UploadGPS(void)
			{
			HIDO_CHAR acHeart[200];
			@@ -286,10 +291,10 @@
			// g_com_map[DEV_ID],GetUWBBindState(),g_com_map[BIND_DEV_ID],alarm_type,bat_percent,g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],jd,wd,applyid,result,distance);
			// }

			u32HeartLen = snprintf(acHeart, sizeof(acHeart), "%s,%04x,%02u%%,%d,%d\r\n", \
			GPS_GGAmessage,g_com_map[DEV_ID],bat_percent,userkey_state,gps_timeout_flag);
			userkey_state = 0;
			Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
			// u32HeartLen = snprintf(acHeart, sizeof(acHeart), "%s,%04x,%02u%%,%d,%d\r\n",
			// GPS_ParseGGA_data,g_com_map[DEV_ID],bat_percent,userkey_state,gps_timeout_flag);
			// userkey_state = 0;
			Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)GPS_ParseGGA_data, GPS_ParseGGA_changdu);
			}

			void TCPHeartBeatUpload(void)
			@@ -307,9 +312,11 @@
			// u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,heart,%04x,%d,%04x,%d,%02u%%,%d,%d,%lf,%lf,%s,%d,%d,0\r\n", \
			// g_com_map[DEV_ID],GetUWBBindState(),g_com_map[BIND_DEV_ID],alarm_type,bat_percent,g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],jd,wd,applyid,result,distance);
			// }
			u32HeartLen = snprintf(acHeart, sizeof(acHeart), "%s,%04x,%02u%%\r\n", \
			GPS_GGAmessage,g_com_map[DEV_ID],bat_percent);
			u32HeartLen = HIDO_UtilSnprintf((HIDO_CHAR *)acHeart, sizeof(acHeart), "$XTB,%X,%02u%%,%d.%d,%s",
			g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID());
			Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);


			}
			void TCPReceiveMessageReply(void)
			{
			@@ -324,7 +331,7 @@
			if(alarm_type == 2)
			alarm_type = 0;
			}

			extern uint32_t uwbled,rtkled,led4g,powerled;
			HIDO_INT32 TCPClient_Poll(void)
			{
			if (Internet_IsIPReady() == HIDO_TRUE)
			@@ -332,6 +339,7 @@
			HIDO_UINT32 u32CurTick = HIDO_TimerGetTick();
			if (TCP_CLIENT_STATE_IDLE == l_eTCPClientState)
			{
			led4g=RED;
			if (!TCPfail_flag)
			{
			l_eTCPClientState = TCP_CLIENT_STATE_CONNECTING;
			@@ -359,6 +367,7 @@
			}
			else if (TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
			{
			led4g=GREEN;
			if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(60)\|\|flag_first_TCPconnect)
			//if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(g_com_map[SEND_4G_SECOND])\|\|flag_first_TCPconnect)
			{
			@@ -375,6 +384,7 @@
			}
			else
			{
			led4g=RED;
			l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
			}