From e9cf7b34ae2a8a1633608c412c372b112995f95a Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期五, 03 一月 2025 18:13:27 +0800 Subject: [PATCH] 4G尝试加入,4G未调通 --- keil/include/src/TCPClient.c | 265 +++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 215 insertions(+), 50 deletions(-) diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c index 8dd8e67..cbbe156 100644 --- a/keil/include/src/TCPClient.c +++ b/keil/include/src/TCPClient.c @@ -20,6 +20,7 @@ #include "mk_4G.h" #include "mk_trace.h" #include "dw_app_anchor.h" +#include "PCA9555.h" /******************************************************************************* * Macro * *******************************************************************************/ @@ -43,11 +44,17 @@ static HIDO_UINT32 l_u32HeartBeatTick = 0; static HIDO_UINT8 l_au8CmdBuff[1024]; +uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1; +uint32_t TCPfailetimer; +uint16_t ip0,ip1,ip2,ip3,port; + /******************************************************************************* * Local Function Declaration * *******************************************************************************/ HIDO_INT32 TCPClient_Heartbeat(HIDO_VOID); - +void TCPHeartBeatUpload(void); +void UDPClient_UploadGPS(void); +void TCPReceiveMessageReply(void); /******************************************************************************* * Local Function * *******************************************************************************/ @@ -60,54 +67,130 @@ * Author : www.hido-studio.com * Modified Date: : 2021年1月9日 *******************************************************************************/ -extern uint8_t gps_4g_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, "$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)); + 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: +// { - if(STRCMP(_u8Data, "$instruct,") == 0) +// 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; +// // bind_resetbreak(); +// case OPEN_GNSS: +// gps_4g_flag = 1; + +// break; + +// case CLOSE_VIBRATION: +// g_com_map[MOTOR_ENABLE]=0; + + +// break; +// case OPEN_VIBRATION: +// g_com_map[MOTOR_ENABLE]=1; + + +// break; +// case QUARY_INFORMATION: +// //?? + +// 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) + save_com_map_to_flash(); +// result = 0; +// memset(&applyid,0,8); + } + } else if(STRCMP(_u8Data, "$readpara,") == 0) { 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) { - TCP_command.type = HIDO_UtilHexStrToInt(apcSplitStr[1]); - - switch(TCP_command.type) + 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++) { - case BIND_SUCCESS: - { - g_com_map[BIND_DEV_ID]=TCP_command.gunLableId; - g_com_map[ALARM_DISTANCE1]=TCP_command.warnDistance; - g_com_map[ALARM_DISTANCE2]=TCP_command.alarmDistance;//这个距离double和uint格式不符 - g_com_map[SEND_4G_FREQUENCY]=1000/TCP_command.frequency; - UWB_work_state = UN_BIND; - save_com_map_to_flash(); + datalenth = sprintf((HIDO_CHAR *)&acReadponse[u32ReadResponseLen],",%d",g_com_map[g_com_position+i]); + u32ReadResponseLen += datalenth; } - break; - case UNBIND: - g_com_map[BIND_DEV_ID] = 0; - UWB_work_state = UN_BIND; - save_com_map_to_flash(); - // bind_resetbreak(); - case OPEN_GNSS: - GpsConrol(1,1); //4Gflag, on - - case CLOSE_VIBRATION: - // vibration_close(); - case QUARY_INFORMATION: - //?? - case CHANGE_POLL_FREQUENCY: - g_com_map[SEND_4G_FREQUENCY]=TCP_command.frequency; - break; - } + Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acReadponse, u32ReadResponseLen); } } return HIDO_OK; @@ -130,6 +213,7 @@ { if(l_eTCPClientState == TCP_CLIENT_STATE_CONNECTING) { + TCPfail_flag = 0; l_eTCPClientState = TCP_CLIENT_STATE_IDLE; } @@ -145,6 +229,7 @@ } case SOCKET_EVENT_CLOSED: { + TCPfail_flag = 0; l_eTCPClientState = TCP_CLIENT_STATE_IDLE; break; } @@ -179,8 +264,68 @@ * Author : www.hido-studio.com * Modified Date: : 2021?1?9? *******************************************************************************/ -uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1; -uint32_t TCPfailetimer; +extern uint8_t bat_percent,taglist_num; +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; +void UDPClient_UploadGPS(void) +{ air780_led_on(); + 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 = 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); + air780_led_off(); +} + +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 = snprintf(acHeart, sizeof(acHeart), "%s,%04x,%02u%%\r\n", \ + GPS_GGAmessage,g_com_map[DEV_ID],bat_percent); + Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen); +} +void TCPReceiveMessageReply(void) +{ + HIDO_CHAR acHeart[200]; + HIDO_UINT32 u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$rec_message,%04x",g_com_map[DEV_ID]); + Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen); +} +void _4GAlarmUpload(uint8_t alarm) +{ + alarm_type = alarm; + TCPHeartBeatUpload(); + if(alarm_type == 2) + alarm_type = 0; +} + HIDO_INT32 TCPClient_Poll(void) { if (Internet_IsIPReady() == HIDO_TRUE) @@ -192,14 +337,17 @@ { l_eTCPClientState = TCP_CLIENT_STATE_CONNECTING; -// HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "%u.%u.%u.%u", g_com_map[TCP_IP_0], -// g_com_map[TCP_IP_1], g_com_map[TCP_IP_2], g_com_map[TCP_IP_3]); -// Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, g_com_map[TCP_PORT]); + 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), "111.198.60.6"); - Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, 1234); - TCPfail_flag = 1; + Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, port); + +// HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "123.57.87.125"); +// Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, 8888); + +// HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "111.198.60.6"); +// Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, 1234); + TCPfail_flag = 1; } else { @@ -213,14 +361,20 @@ else if (TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState) { - if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(15)||flag_first_TCPconnect) + + + + if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(5)||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; // 这里是自定义心跳 - 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); + //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); } } } @@ -248,6 +402,11 @@ return HIDO_OK; } +HIDO_BOOL TCPClient_IsSendOver(HIDO_VOID) +{ + return Socket_IsSendQueueEmpty(l_i32TCPClientID); +} + /******************************************************************************* * Function Name : TCPClient_Init * Description : TCP客户端初始化 @@ -260,7 +419,7 @@ HIDO_INT32 TCPClient_Init(void) { l_eTCPClientState = TCP_CLIENT_STATE_IDLE; - Socket_Create(&l_i32TCPClientID, SOCKET_TYPE_TCP, TCPClient_SocketEventProc, HIDO_NULL); + Socket_Create(&l_i32TCPClientID, SOCKET_TYPE_UDP, TCPClient_SocketEventProc, HIDO_NULL); // 这里是固定的心跳,由4G自行发送 #if 0 @@ -271,11 +430,17 @@ return HIDO_OK; } +char str[17]= {"AT+IPR=9600;&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 +// 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,115200); +// uart_send(UART_ID0, str,17, NULL); +// Uart_ReConfigBaudRate(UART_ID_4G,9600); + } uint8_t IfTCPConnected(void) { -- Gitblit v1.9.3