From 63bf8ea65ca11349d5fae93580f91a87d3633dba Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 14 三月 2025 18:45:47 +0800
Subject: [PATCH] 工卡改为通道9,加入ntrip跟tcp。ntrip不能用  shell不能用

---
 keil/include/src/TCPClient.c |  299 ++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 210 insertions(+), 89 deletions(-)

diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 6adf7b9..879d542 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -20,6 +20,8 @@
 #include "mk_4G.h"
 #include "mk_trace.h"
 #include "dw_app_anchor.h"
+#include "PCA9555.h"
+#include "WS2812.h"
 /*******************************************************************************
  *                                  Macro                                      *
  *******************************************************************************/
@@ -38,20 +40,21 @@
  *                             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];
 
-uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1;
-uint32_t TCPfailetimer;
+static uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1;
+static uint32_t TCPfailetimer;
 uint16_t ip0,ip1,ip2,ip3,port;
 
 /*******************************************************************************
  *                        Local Function Declaration                           *
  *******************************************************************************/
-HIDO_INT32 TCPClient_Heartbeat(HIDO_VOID);
+static HIDO_INT32 TCPClient_Heartbeat(HIDO_VOID);
 void TCPHeartBeatUpload(void);
+void UDPClient_UploadGPS(void);
 void TCPReceiveMessageReply(void);
 /*******************************************************************************
  *                             Local Function                                  *
@@ -65,100 +68,130 @@
  * Author            : www.hido-studio.com
  * Modified Date:    : 2021年1月9日
  *******************************************************************************/
-extern uint8_t gps_4g_flag,search_open_flag;
+extern uint8_t gps_4g_flag,search_open_flag,gps_open_flag,gps_wait_count,gps_need_data_flag,gps_wait_count2;
 extern Operation_step UWB_work_state;
 Commend_Datestruct TCP_command;
 uint8_t result;
 char applyid[10];
+uint16_t receive_id;
+uint16_t g_com_position;
+uint16_t g_com_num;
 static HIDO_INT32 TCPClient_DataProc(HIDO_UINT8 *_u8Data, HIDO_UINT32 _u32Len)
 {
     HIDO_CHAR *apcSplitStr[12];
     HIDO_UINT32 u32SplitCnt = 0;
-
+		HIDO_CHAR acResponse[200];
+		HIDO_CHAR temp_acResponse[200];
+		HIDO_CHAR acReadponse[200];
+		HIDO_UINT32 datalenth;
+		HIDO_UINT32 u32ResponseLen;
+		HIDO_UINT32 u32ReadResponseLen;
     LOG_INFO(TRACE_MODULE_APP, "收到数据\r\n");
 
 
-
-    if(STRCMP(_u8Data, "$instruct,") == 0)
+						
+    if(STRCMP(_u8Data, "$setpara,") == 0)
     {
+				u32ResponseLen = snprintf(acResponse, sizeof(acResponse), "$setparaok,%s\r\n", \
+                              _u8Data);
+				memcpy(temp_acResponse,acResponse,sizeof(acResponse));
+				
         u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
-        TCP_command.tagId = HIDO_UtilHexStrToInt(apcSplitStr[3]);
-
-        if(g_com_map[DEV_ID]==TCP_command.tagId)
+        receive_id = HIDO_UtilHexStrToInt(apcSplitStr[1]);
+				
+        if(g_com_map[DEV_ID]==receive_id)
         {
+						g_com_position=HIDO_UtilStrToInt(apcSplitStr[2]);
+						 	if(g_com_position!=CNT_RESTART&&g_com_position!=0&&g_com_position!=CNT_UPDATE)
+							{
+								Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)temp_acResponse, u32ResponseLen);
+								g_com_map[g_com_position]=HIDO_UtilStrToInt(apcSplitStr[3]);
+							}
+								if(g_com_map[SEND_4G_SECOND]<30)
+							{
+							gps_open_flag=0;
+							gps_wait_count=0;
+							gps_wait_count2=0;
+							gps_need_data_flag=1;//切换状态
+							}else{
+							gps_open_flag=1;
+							gps_wait_count=0;
+							gps_wait_count2=0;
+							gps_need_data_flag=1;//切换状态
+							}
+							
+//            switch(TCP_command.type)
+//            {
+//            case BIND_SUCCESS:
+//            {
 
-            TCP_command.type = HIDO_UtilStrToInt(apcSplitStr[1]);
-            memcpy(&applyid,apcSplitStr[2],8);
-            // TCP_command.applyID = HIDO_UtilStrToInt(apcSplitStr[2]);
-            TCP_command.gunLableId = HIDO_UtilHexStrToInt(apcSplitStr[4]);
-            TCP_command.warnDistance = HIDO_UtilStrToInt(apcSplitStr[5]);
-            TCP_command.alarmDistance = HIDO_UtilStrToInt(apcSplitStr[6]);
-            TCP_command.frequency = HIDO_UtilStrToInt(apcSplitStr[7]);
-            if(TCP_command.type>0&&TCP_command.type<8)
-                result = 1;
-
-            switch(TCP_command.type)
-            {
-            case BIND_SUCCESS:
-            {
-
-                g_com_map[ALARM_DISTANCE1]= TCP_command.warnDistance;
-                g_com_map[ALARM_DISTANCE2]=TCP_command.alarmDistance;
-                // g_com_map[SEND_4G_FREQUENCY]=1000/TCP_command.frequency;
-                if(g_com_map[BIND_DEV_ID]!=TCP_command.gunLableId)
-                {
-                    g_com_map[BIND_DEV_ID]=TCP_command.gunLableId;
-                    UWB_work_state = SEARCH_DEV;
-                    search_open_flag = 1;
-                }
+//                g_com_map[ALARM_DISTANCE1]= TCP_command.warnDistance;
+//                g_com_map[ALARM_DISTANCE2]=TCP_command.alarmDistance;
+//                // g_com_map[SEND_4G_FREQUENCY]=1000/TCP_command.frequency;
+//                if(g_com_map[BIND_DEV_ID]!=TCP_command.gunLableId)
+//                {
+//                    g_com_map[BIND_DEV_ID]=TCP_command.gunLableId;
+//                    UWB_work_state = SEARCH_DEV;
+//                    search_open_flag = 1;
+//                }
 
 
-            }
-            break;
-            case UNBIND:
-                g_com_map[BIND_DEV_ID] = 0;
-                UWB_work_state = UN_BIND;
+//            }
+//            break;
+//            case UNBIND:
+//                g_com_map[BIND_DEV_ID] = 0;
+//                UWB_work_state = UN_BIND;
 
 
-                break;
-                // bind_resetbreak();
-            case OPEN_GNSS:
-                gps_4g_flag = 1;
+//                break;
+//                // bind_resetbreak();
+//            case OPEN_GNSS:
+//                gps_4g_flag = 1;
 
-                break;
+//                break;
 
-            case CLOSE_VIBRATION:
-                g_com_map[MOTOR_ENABLE]=0;
+//            case CLOSE_VIBRATION:
+//                g_com_map[MOTOR_ENABLE]=0;
 
 
-                break;
-            case OPEN_VIBRATION:
-                g_com_map[MOTOR_ENABLE]=1;
+//                break;
+//            case OPEN_VIBRATION:
+//                g_com_map[MOTOR_ENABLE]=1;
 
 
-                break;
-            case QUARY_INFORMATION:
-                //??
+//                break;
+//            case QUARY_INFORMATION:
+//                //??
 
-                break;
-            case CHANGE_POLL_FREQUENCY:
+//                break;
+//            case CHANGE_POLL_FREQUENCY:
 
-                g_com_map[SEND_4G_SECOND]=TCP_command.frequency*60;
-                break;
-            }
-            result = 1;
-            TCPHeartBeatUpload();
-            if(TCP_command.type!=QUARY_INFORMATION||TCP_command.type!=OPEN_GNSS)
+//                g_com_map[SEND_4G_SECOND]=TCP_command.frequency*60;
+//                break;
+//            }
+//            result = 1;
+//            TCPHeartBeatUpload();
+//            if(TCP_command.type!=QUARY_INFORMATION||TCP_command.type!=OPEN_GNSS)
                 save_com_map_to_flash();
-            result = 0;
-            memset(&applyid,0,8);
+//            result = 0;
+//            memset(&applyid,0,8);
         }
-    } else if(STRCMP(_u8Data, "$message_reply,") == 0)
+    } else if(STRCMP(_u8Data, "$readpara,") == 0)
     {
         u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
-        TCP_command.tagId = HIDO_UtilHexStrToInt(apcSplitStr[1]);
-        if(g_com_map[DEV_ID]==TCP_command.tagId)
+        receive_id = HIDO_UtilHexStrToInt(apcSplitStr[1]);
+        if(g_com_map[DEV_ID]==receive_id)
         {
+					 g_com_position=HIDO_UtilStrToInt(apcSplitStr[2]);
+					 g_com_num=	HIDO_UtilStrToInt(apcSplitStr[3]);
+					u32ReadResponseLen = snprintf(acReadponse, sizeof(acReadponse), "$replypara,%04x,%d", \
+                              receive_id,g_com_position);
+					for(uint16_t i=0;i<g_com_num;i++)
+            {
+                datalenth = sprintf((HIDO_CHAR *)&acReadponse[u32ReadResponseLen],",%d",g_com_map[g_com_position+i]);
+                u32ReadResponseLen += datalenth;
+            }
+					Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acReadponse, u32ReadResponseLen);
         }
     }
     return HIDO_OK;
@@ -236,11 +269,20 @@
 uint8_t alarm_type;
 extern double jd,wd;
 extern int32_t distance;
-void TCPHeartBeatUpload(void)
+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];
     HIDO_UINT32 u32HeartLen;
-//    if(alarm_type)
+	 ave_sp = g_spsum/g_snum;
+    g_spsum = 0;
+    g_snum = 0;
+//    if(alarm_type==1)
 //    {
 //        u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,alarm,%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);
@@ -248,12 +290,67 @@
 //        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), "$message,GPS,%04x,%lf,%lf\r\n", \
-                               g_com_map[DEV_ID],jd,wd);
-
-    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);
 }
+char senddata[2048];
+void HexToAsciiSendUDP(uint8_t* data,uint8_t len)
+{
+    static HIDO_CHAR l_acUploadBuff[2048];
+    static HIDO_UINT32 l_u32UploadBuffLen = 0;
+    static HIDO_UINT32 l_u32UdpsendTick = 0;
+	uint8_t i,temp;
+	
+	for(i=0;i<len;i++)
+	{
+		temp = *data++;
+		sprintf(&senddata[2*i],"%x",temp>>4);
+		sprintf(&senddata[2*i+1],"%x",temp&0xf);
+	}
+    senddata[2*len] = 0x0d;
+    senddata[2*len+1] = 0x0a;
+//    if(DBG_GetMode() == DBG_MODE_CFG)
+//    Uart_Send(0, (HIDO_UINT8 *) senddata, 2*len+2);
+//    UDPClient_Uploadhex(senddata,2*len+2);
+    if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
+    {
+        memcpy(l_acUploadBuff + l_u32UploadBuffLen, senddata, 2*len+2);
+        l_u32UploadBuffLen += 2*len+2;
+       // if((l_u32UploadBuffLen + u32Len )> sizeof(l_acUploadBuff))
+//        if((HIDO_TimerGetTick() - l_u32UdpsendTick) >= 200)
+//        {
+//            l_u32UdpsendTick = HIDO_TimerGetTick();
+            Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_acUploadBuff, l_u32UploadBuffLen);
+            l_u32UploadBuffLen = 0;
+//        }
 
+
+    }
+}
+void TCPHeartBeatUpload(void)
+{
+    HIDO_CHAR acHeart[200];
+    HIDO_UINT32 u32HeartLen;
+	 ave_sp = g_spsum/g_snum;
+    g_spsum = 0;
+    g_snum = 0;
+//    if(alarm_type==1)
+//    {
+//        u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,alarm,%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);
+//    } else {
+//        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 = 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)
 {
     HIDO_CHAR acHeart[200];
@@ -263,11 +360,11 @@
 void _4GAlarmUpload(uint8_t alarm)
 {
     alarm_type = alarm;
-    //TCPHeartBeatUpload();
+    TCPHeartBeatUpload();
     if(alarm_type == 2)
         alarm_type = 0;
 }
-
+extern uint32_t uwbled,rtkled,led4g,powerled;
 HIDO_INT32 TCPClient_Poll(void)
 {
     if (Internet_IsIPReady() == HIDO_TRUE)
@@ -275,14 +372,15 @@
         HIDO_UINT32 u32CurTick = HIDO_TimerGetTick();
         if (TCP_CLIENT_STATE_IDLE == l_eTCPClientState)
         {
+            led4g=RED;
             if (!TCPfail_flag)
             {
                 l_eTCPClientState = TCP_CLIENT_STATE_CONNECTING;
 
 
-                HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "%u.%u.%u.%u", ip0,ip1, ip2, ip3);
+               HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "%u.%u.%u.%u", g_com_map[IP_0], g_com_map[IP_1], g_com_map[IP_2], g_com_map[IP_3]);
 
-                Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, port);
+                Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, g_com_map[PORT]);
 
 //             HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "123.57.87.125");
 //                Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, 8888);
@@ -302,16 +400,15 @@
         }
         else if (TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
         {
-
-
-
-      //      if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(g_com_map[SEND_4G_SECOND])||flag_first_TCPconnect)
-            if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(15)||flag_first_TCPconnect)
+           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)
             {
                 flag_first_TCPconnect = 0;
                 l_u32HeartBeatTick = u32CurTick;
                 // 这里是自定义心跳
-                //TCPHeartBeatUpload();
+                TCPHeartBeatUpload();
+								//UDPClient_UploadGPS();//先不弄心跳
 //                HIDO_CHAR acHeart[128];
 //                HIDO_UINT32 u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message heart,%04x,00001,1,50,50,50,,,,\r\n", g_com_map[DEV_ID]);
 //                Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
@@ -320,6 +417,7 @@
     }
     else
     {
+        led4g=RED;
         l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
     }
 
@@ -341,7 +439,29 @@
 
     return HIDO_OK;
 }
+HIDO_INT32 TCPClient_Uploadhex(uint8_t *_pcGGA,uint16_t u32Len)
+{
+    static HIDO_CHAR l_acUploadBuff[1024];
+    static HIDO_UINT32 l_u32UploadBuffLen = 0;
+    static HIDO_UINT32 l_u32UdpsendTick = 0;
+    
+    if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
+    {
+        memcpy(l_acUploadBuff + l_u32UploadBuffLen, _pcGGA, u32Len);
+        l_u32UploadBuffLen += u32Len;
+       // if((l_u32UploadBuffLen + u32Len )> sizeof(l_acUploadBuff))
+        if((HIDO_TimerGetTick() - l_u32UdpsendTick) >= 200)
+        {
+            l_u32UdpsendTick = HIDO_TimerGetTick();
+            Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_acUploadBuff, l_u32UploadBuffLen);
+            l_u32UploadBuffLen = 0;
+        }
 
+
+    }
+
+    return HIDO_OK;
+}
 HIDO_BOOL TCPClient_IsSendOver(HIDO_VOID)
 {
     return Socket_IsSendQueueEmpty(l_i32TCPClientID);
@@ -370,16 +490,17 @@
 
     return HIDO_OK;
 }
-char str[17]= {"AT+IPR=9600;&W\r\n"};
+char str[19]= {"AT+IPR=115200;&W\r\n"};
 void AIR780E_Reset(void)
 {
-    gps_air780_power_change(gps_power_state,0);//开启gps,4G
-    delay_us(1500000);
-    gps_air780_power_change(gps_power_state,1);//开启gps,4G
-//    delay_us(3000000);
-//    Uart_ReConfigBaudRate(UART_ID_4G,115200);
-//    uart_send(UART_ID0, str,17, NULL);
+		PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭4G
+    delay_ms(1500);
+    PCA9555_Set_One_Value_Output(AIR780E_ENBALE,1);//打开4G
+    delay_ms(3000);
 //    Uart_ReConfigBaudRate(UART_ID_4G,9600);
+//    uart_send(UART_ID0, str,19, NULL);
+//    Uart_ReConfigBaudRate(UART_ID_4G,115200);
+
 }
 uint8_t IfTCPConnected(void)
 {

--
Gitblit v1.9.3