From 2ebb8217f43b69f491620423ea4d5d5944d1f91d Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期六, 05 七月 2025 22:43:58 +0800
Subject: [PATCH] 格式化部分代码
---
keil/include/src/TCPClient.c | 343 ++++++++++++++++++++++++++++----------------------------
1 files changed, 172 insertions(+), 171 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index a72a78b..ac6b27c 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -91,7 +91,7 @@
{
HIDO_CHAR *apcSplitStr[12];
HIDO_UINT32 u32SplitCnt = 0;
-
+
HIDO_UINT32 u32Len = 0;
// HIDO_Debug("%s\r\n", l_au8CmdBuff);
@@ -146,7 +146,7 @@
if(bChange)
{
save_com_map_to_flash();
- g_com_map[CNT_RESTART] = 1;
+ g_com_map[CNT_RESTART] = 1;
}
}
}
@@ -168,7 +168,7 @@
// uart_send(UART_ID1, (char *)&apcSplitStr[2],strlen(apcSplitStr[3]), NULL);
// memcpy(testdata,(HIDO_UINT8*)apcSplitStr[2],strlen(apcSplitStr[2]) + 1);
// OTA_Start((HIDO_UINT8*)apcSplitStr[2]);
-
+
// g_com_map[OTA_FLAG]=1;
// g_com_map[OTA_URL_CHANGDU]=strlen(apcSplitStr[2]) + 1;
// memcpy(g_com_map+OTA_URL_INDEX,(HIDO_UINT8*)apcSplitStr[2],strlen(apcSplitStr[2]) + 1);
@@ -178,13 +178,13 @@
uint8_t flag = 0;
__disable_irq();
result=flash_open(FLASH_ID0,NULL);
- if(!result)
+ if(!result)
{
- flash_erase(FLASH_ID0, APP_CONFIG_IAPFLAG_SECTOR_ADDR, FLASH_SECTOR_SIZE);//擦除APPFLAG
- flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAPFLAG_MAP, (uint8_t*)&tmp, sizeof(tmp));
- flash_erase(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP, FLASH_SECTOR_SIZE);//擦除APPFLAG
- flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP, (HIDO_UINT8 *)&flag, 1);
- flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP+1, (HIDO_UINT8*)apcSplitStr[2], strlen(apcSplitStr[2]) + 1);
+ flash_erase(FLASH_ID0, APP_CONFIG_IAPFLAG_SECTOR_ADDR, FLASH_SECTOR_SIZE);//擦除APPFLAG
+ flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAPFLAG_MAP, (uint8_t*)&tmp, sizeof(tmp));
+ flash_erase(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP, FLASH_SECTOR_SIZE);//擦除APPFLAG
+ flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP, (HIDO_UINT8 *)&flag, 1);
+ flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP+1, (HIDO_UINT8*)apcSplitStr[2], strlen(apcSplitStr[2]) + 1);
}
__enable_irq();
NVIC_SystemReset(); //软复位回到bootloader
@@ -211,7 +211,7 @@
else if(STRCMP(_u8Data, "$control,") == 0)
{
u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
- if(u32SplitCnt < 3)
+ if(u32SplitCnt < 3)
{
return HIDO_ERR;
}
@@ -221,27 +221,27 @@
{
if(strcmp(apcSplitStr[2],"beeper")==0)
{
-
+
// beepontime = HIDO_UtilStrToInt(apcSplitStr[3]);
-
+
}
-
- if(strcmp(apcSplitStr[2],"TTS")==0)
- {
- PCA9555_Set_One_Value_Output(TTS_ENABLE,1); //打开TTS电源
- delay_ms(800); //再短一点，会丢失语音的第一个字，不是不读，而是就像没有下发第一个字
-
+
+ if(strcmp(apcSplitStr[2],"TTS")==0)
+ {
+ PCA9555_Set_One_Value_Output(TTS_ENABLE,1); //打开TTS电源
+ delay_ms(800); //再短一点，会丢失语音的第一个字，不是不读，而是就像没有下发第一个字
+
// TTS_Play((HIDO_UINT8 *)apcSplitStr[3], strlen(apcSplitStr[3])); //服务器语音播报
-
-
- u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$Receivevoice,%X\r\n",
- g_com_map[DEV_ID]);
-
- Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_au8CmdBuff, u32Len);
-
-
- }
-
+
+
+ u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$Receivevoice,%X\r\n",
+ g_com_map[DEV_ID]);
+
+ Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_au8CmdBuff, u32Len);
+
+
+ }
+
}
}
else if(STRCMP(_u8Data, "$userdata,") == 0)
@@ -260,14 +260,14 @@
if(g_com_map[DEV_ID] == HIDO_UtilHexStrToInt((char *)stId.m_pData))
{
// TONE_Play((HIDO_UINT8 *)stData.m_pData, stData.m_u32Len);
-
+
u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$Receivevoice,%X\r\n",
- g_com_map[DEV_ID]); //TTS收到回复
-
+ g_com_map[DEV_ID]); //TTS收到回复
+
Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_au8CmdBuff, u32Len);
}
}
- }else if(STRCMP(_u8Data, "$setpara,") == 0)
+ } else if(STRCMP(_u8Data, "$setpara,") == 0)
{
uint16_t tempindex,tempval;
u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
@@ -282,11 +282,11 @@
if(tempindex == MOTOR_ONTIME_INDEX)
{
// beepontime = tempval;
- }else{
- if(tempindex < COM_MAP_SIZE)
- g_com_map[tempindex] = tempval;
- save_com_map_to_flash();
- g_com_map[CNT_RESTART] = 1;
+ } else {
+ if(tempindex < COM_MAP_SIZE)
+ g_com_map[tempindex] = tempval;
+ save_com_map_to_flash();
+ g_com_map[CNT_RESTART] = 1;
}
}
}
@@ -303,12 +303,12 @@
}
tempindex = HIDO_UtilStrToInt(apcSplitStr[2]);
templen = HIDO_UtilStrToInt(apcSplitStr[3]);
- if(templen>10)
- templen=10;
+ if(templen>10)
+ templen=10;
buffer_len = sprintf(send_buffer,"$replypara,");
datalen = sprintf(&send_buffer[buffer_len],"%x,",g_com_map[DEV_ID]);
buffer_len += datalen;
- for(uint16_t i=tempindex;i<templen+tempindex;i++)
+ for(uint16_t i=tempindex; i<templen+tempindex; i++)
{
datalen = sprintf(&send_buffer[buffer_len],"%d,",g_com_map[i]);
buffer_len += datalen;
@@ -326,7 +326,7 @@
{
uint16_t buffer_len,datalen;
u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
- char send_buffer[20]={0};
+ char send_buffer[20]= {0};
if (u32SplitCnt < 3)
{
return HIDO_ERR;
@@ -358,8 +358,8 @@
{
uint16_t buffer_len,datalen,datalen1,temp;
u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
- char send_buffer[20]={0};
-
+ char send_buffer[20]= {0};
+
if (u32SplitCnt < 3)
{
return HIDO_ERR;
@@ -401,8 +401,8 @@
// gpsbaudrate1= HIDO_UtilStrToInt(apcSplitStr[6]);
// g_com_map[GPSBAUDRATE1_INDEX] = gpsbaudrate1>>16;
// g_com_map[GPSBAUDRATE2_INDEX] = gpsbaudrate1;
-//
-//
+//
+//
// if((g_com_map[GPSENBLE]||g_com_map[GPSENBLE]==0)
// &&(g_com_map[UWBENBLE]||g_com_map[UWBENBLE]==0)
// &&(g_com_map[GPSFrequency]<65535&&g_com_map[GPSFrequency]>0)
@@ -424,7 +424,7 @@
{
u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
uint16_t buffer_len,datalen;
- char send_buffer[100]={0};
+ char send_buffer[100]= {0};
if (u32SplitCnt < 1)
{
return HIDO_ERR;
@@ -446,102 +446,102 @@
}
checksum = Checksum_u16(&send_buffer[2],5+160);
memcpy(&send_buffer[7+160],&checksum,2);
-
+
Socket_Send(l_i32TCPClientID,send_buffer,9+160);
}
}
else if (STRCMP(_u8Data, "$set_uwb_work,") == 0)
{
- uint16_t temp,buffer_len,datalen,datalen1;
- u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
- char send_buffer[30]={0};
- if (u32SplitCnt < 3)
- {
- return HIDO_ERR;
- }
- if (HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
+ uint16_t temp,buffer_len,datalen,datalen1;
+ u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
+ char send_buffer[30]= {0};
+ if (u32SplitCnt < 3)
{
- temp=HIDO_UtilStrToInt(apcSplitStr[2]);
- if(temp==1)
- {
- OpenUWB();
- uwb_OpenClose_flag=1;
- }
- else if(temp==0)
- {
- CloseUWB();
- uwb_OpenClose_flag=0;
- }
- buffer_len = sprintf(send_buffer,"$rec_uwb_work,");
- datalen = sprintf(&send_buffer[buffer_len],"%x,",g_com_map[DEV_ID]);
- buffer_len += datalen;
- datalen1=sprintf(&send_buffer[buffer_len],"%d",temp);
- buffer_len+= datalen1;
- Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,buffer_len);
+ return HIDO_ERR;
}
-
+ if (HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
+ {
+ temp=HIDO_UtilStrToInt(apcSplitStr[2]);
+ if(temp==1)
+ {
+ OpenUWB();
+ uwb_OpenClose_flag=1;
+ }
+ else if(temp==0)
+ {
+ CloseUWB();
+ uwb_OpenClose_flag=0;
+ }
+ buffer_len = sprintf(send_buffer,"$rec_uwb_work,");
+ datalen = sprintf(&send_buffer[buffer_len],"%x,",g_com_map[DEV_ID]);
+ buffer_len += datalen;
+ datalen1=sprintf(&send_buffer[buffer_len],"%d",temp);
+ buffer_len+= datalen1;
+ Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,buffer_len);
+ }
+
}
else if (STRCMP(_u8Data, "$set_uwb_frequency,") == 0)
{
- uint16_t temp,buffer_len,datalen,datalen1;
-
- u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
- char send_buffer[30]={0};
- if (u32SplitCnt < 3)
- {
- return HIDO_ERR;
- }
+ uint16_t temp,buffer_len,datalen,datalen1;
+
+ u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
+ char send_buffer[30]= {0};
+ if (u32SplitCnt < 3)
+ {
+ return HIDO_ERR;
+ }
if (HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
{
- HIDO_INT32 frequency;
- frequency=HIDO_UtilStrToInt(apcSplitStr[2]);
- g_com_map[UWBFrequency]=frequency;
-
- state_start_time=0;
- uwb_time_count=0;
- buffer_len = sprintf(send_buffer,"$rec_uwbfrequency,");
- datalen = sprintf(&send_buffer[buffer_len],"%x,",g_com_map[DEV_ID]);
- buffer_len += datalen;
- datalen1=sprintf(&send_buffer[buffer_len],"%d",frequency);
- buffer_len+= datalen1;
- save_com_map_to_flash();
- Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,buffer_len);
+ HIDO_INT32 frequency;
+ frequency=HIDO_UtilStrToInt(apcSplitStr[2]);
+ g_com_map[UWBFrequency]=frequency;
+
+ state_start_time=0;
+ uwb_time_count=0;
+ buffer_len = sprintf(send_buffer,"$rec_uwbfrequency,");
+ datalen = sprintf(&send_buffer[buffer_len],"%x,",g_com_map[DEV_ID]);
+ buffer_len += datalen;
+ datalen1=sprintf(&send_buffer[buffer_len],"%d",frequency);
+ buffer_len+= datalen1;
+ save_com_map_to_flash();
+ Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,buffer_len);
}
}
else if (STRCMP(_u8Data, "$set_gpsuwb_fet,") == 0)
{
- uint16_t temp,buffer_len,datalen,datalen1,datalen2,datalen3;
-
- u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
- char send_buffer[30]={0};
- if (u32SplitCnt < 3)
- {
- return HIDO_ERR;
- }
+ uint16_t temp,buffer_len,datalen,datalen1,datalen2,datalen3;
+
+ u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
+ char send_buffer[30]= {0};
+ if (u32SplitCnt < 3)
+ {
+ return HIDO_ERR;
+ }
if (HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
{
- HIDO_INT32 frequency,temp,temp1;
- frequency=HIDO_UtilStrToInt(apcSplitStr[2]);
- temp=HIDO_UtilStrToInt(apcSplitStr[3]);
- temp1=HIDO_UtilStrToInt(apcSplitStr[4]);
- g_com_map[GPSFrequency]=frequency;
- g_com_map[IMU_ENABLE]=temp;
- g_com_map[NOMOVESLEEP_TIME]=temp1;
- GPS_UPLOAD_FLAG=0;
- nomove_count=0;
- buffer_len = sprintf(send_buffer,"$rec_gpsuwb_fet,");
- datalen = sprintf(&send_buffer[buffer_len],"%x,",g_com_map[DEV_ID]);
- buffer_len += datalen;
- datalen1=sprintf(&send_buffer[buffer_len],"%d,",frequency);
- buffer_len+= datalen1;
- datalen2=sprintf(&send_buffer[buffer_len],"%d,",temp);
- buffer_len+= datalen2;
- datalen3=sprintf(&send_buffer[buffer_len],"%d",temp1);
- buffer_len+= datalen3;
- save_com_map_to_flash();
- Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,buffer_len);
+ HIDO_INT32 frequency,temp,temp1;
+ frequency=HIDO_UtilStrToInt(apcSplitStr[2]);
+ temp=HIDO_UtilStrToInt(apcSplitStr[3]);
+ temp1=HIDO_UtilStrToInt(apcSplitStr[4]);
+ g_com_map[GPSFrequency]=frequency;
+ g_com_map[IMU_ENABLE]=temp;
+ g_com_map[NOMOVESLEEP_TIME]=temp1;
+ GPS_UPLOAD_FLAG=0;
+ nomove_count=0;
+ buffer_len = sprintf(send_buffer,"$rec_gpsuwb_fet,");
+ datalen = sprintf(&send_buffer[buffer_len],"%x,",g_com_map[DEV_ID]);
+ buffer_len += datalen;
+ datalen1=sprintf(&send_buffer[buffer_len],"%d,",frequency);
+ buffer_len+= datalen1;
+ datalen2=sprintf(&send_buffer[buffer_len],"%d,",temp);
+ buffer_len+= datalen2;
+ datalen3=sprintf(&send_buffer[buffer_len],"%d",temp1);
+ buffer_len+= datalen3;
+ save_com_map_to_flash();
+ Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,buffer_len);
}
@@ -549,7 +549,7 @@
// else if (STRCMP(_u8Data, "$set_sleep_enable_time,") == 0)
// {
// uint16_t temp,buffer_len,datalen,datalen1,datalen2;
-//
+//
// u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
// char send_buffer[30]={0};
// if (u32SplitCnt < 3)
@@ -559,15 +559,15 @@
// if (HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
// {
// HIDO_INT32 temp,temp1;
-// temp=HIDO_UtilStrToInt(apcSplitStr[2]);
+// temp=HIDO_UtilStrToInt(apcSplitStr[2]);
// temp1=HIDO_UtilStrToInt(apcSplitStr[3]);
-//
-//
+//
+//
// g_com_map[IMU_ENABLE]=temp;
// g_com_map[NOMOVESLEEP_TIME]=temp1;
-//
+//
// buffer_len = sprintf(send_buffer,"$rec_sleep_enable_time,");
-// datalen = sprintf(&send_buffer[buffer_len],"%x,",g_com_map[DEV_ID]);
+// datalen = sprintf(&send_buffer[buffer_len],"%x,",g_com_map[DEV_ID]);
// buffer_len += datalen;
// datalen1=sprintf(&send_buffer[buffer_len],"%d",temp);
// buffer_len+= datalen1;
@@ -663,23 +663,24 @@
uint8_t uwbsendnum,gpssendnum;
extern uint8_t exercise_state;
-extern uint32_t step_count;
-extern uint16_t gaodu;void UDPClient_UploadGPS(HIDO_CHAR *_pcGGA)
+extern uint32_t step_count;
+extern uint16_t gaodu;
+void UDPClient_UploadGPS(HIDO_CHAR *_pcGGA)
{
if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
{
-
-#ifdef JIBU_XIUMIAN
+
+#ifdef JIBU_XIUMIAN
HIDO_UINT32 u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "%s,%X,%02x,%x,%d,%d,%d%\r\n",
// _pcGGA, g_com_map[DEV_ID], bat_percent,ave_sp,0,0,0);
- _pcGGA, g_com_map[DEV_ID], bat_percent,ave_sp,gaodu,(uint8_t)(step_count),exercise_state);
+ _pcGGA, g_com_map[DEV_ID], bat_percent,ave_sp,gaodu,(uint8_t)(step_count),exercise_state);
#else
HIDO_UINT32 u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "%s,%X,%02x,%x,%d,%d,%d%\r\n",
- _pcGGA, g_com_map[DEV_ID], bat_percent,ave_sp,gaodu,0,0);
+ _pcGGA, g_com_map[DEV_ID], bat_percent,ave_sp,gaodu,0,0);
#endif
-
+
// if((l_u32UploadBuffLen + u32Len) < sizeof(l_acUploadBuff))
// {
// memcpy(l_acUploadBuff + l_u32UploadBuffLen, l_au8CmdBuff, u32Len);
@@ -687,7 +688,7 @@
// }
//memcpy(l_acUploadBuff + l_u32UploadBuffLen, l_au8CmdBuff, u32Len);
//l_u32UploadBuffLen += u32Len;
- // if((l_u32UploadBuffLen + u32Len )> sizeof(l_acUploadBuff))
+ // if((l_u32UploadBuffLen + u32Len )> sizeof(l_acUploadBuff))
// if((HIDO_TimerGetTick() - l_u32UdpsendTick) >= 200)
{
// l_u32UdpsendTick = HIDO_TimerGetTick();
@@ -705,14 +706,14 @@
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);
- }
+ 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)
@@ -722,13 +723,13 @@
{
memcpy(l_acUploadBuff + l_u32UploadBuffLen, senddata, 2*len+2);
l_u32UploadBuffLen += 2*len+2;
- // if((l_u32UploadBuffLen + u32Len )> sizeof(l_acUploadBuff))
+ // 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);
- uwbsendnum++;
- l_u32UploadBuffLen = 0;
+ Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_acUploadBuff, l_u32UploadBuffLen);
+ uwbsendnum++;
+ l_u32UploadBuffLen = 0;
// }
@@ -739,30 +740,30 @@
HIDO_UINT32 u32Len = 0;
if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
{
-
+
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.,1",
g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),\
- userkey_state,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]);
+ userkey_state,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,1",
g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),\
- userkey_state,(char *)&g_com_map[NTRIP_HOST_INDEX],(char *)&g_com_map[NTRIP_USERNANME_INDEX]);
+ userkey_state,(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.,1",
g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),\
- userkey_state,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]);
+ userkey_state,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]);
}
- userkey_state=0;
+ userkey_state=0;
Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_au8CmdBuff, u32Len);
}
// 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());
+// 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)
{
@@ -792,16 +793,16 @@
l_eTCPClientState = TCP_CLIENT_STATE_CONNECTING;
- 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]);
+ 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, 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);
-
-// HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "111.198.60.6");
+
+// 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;
+ TCPfail_flag = 1;
}
else
{
@@ -814,16 +815,16 @@
}
else if (TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
{
- led4g=GREEN;
- if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(60)||flag_first_TCPconnect||heartbeasend_flag)
- //if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(g_com_map[SEND_4G_SECOND])||flag_first_TCPconnect)
+ led4g=GREEN;
+ if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(60)||flag_first_TCPconnect||heartbeasend_flag)
+ //if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(g_com_map[SEND_4G_SECOND])||flag_first_TCPconnect)
{
heartbeasend_flag=0;
flag_first_TCPconnect = 0;
l_u32HeartBeatTick = u32CurTick;
// 这里是自定义心跳
TCPHeartBeatUpload();
- //UDPClient_UploadGPS();//先不弄心跳
+ //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);
@@ -859,12 +860,12 @@
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((l_u32UploadBuffLen + u32Len )> sizeof(l_acUploadBuff))
if((HIDO_TimerGetTick() - l_u32UdpsendTick) >= 200)
{
l_u32UdpsendTick = HIDO_TimerGetTick();
@@ -909,17 +910,17 @@
char str[19]= {"AT+IPR=115200;&W\r\n"};
void AIR780E_Reset(void)
{
- PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭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);
-}
+}
void AIR780E_Reset_usart(void)
{
- PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭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);
@@ -941,7 +942,7 @@
char str[17]= {"AT+IPR=9600;&W\r\n"};
void AIR780E_Reset(void)
{
- PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭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);
@@ -951,7 +952,7 @@
}
void AIR780E_Reset_usart(void)
{
- PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭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);
--
Gitblit v1.9.3