From 2a1115b77100f6bfeca9031d9a9c82b07e130d32 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期五, 28 三月 2025 09:11:09 +0800
Subject: [PATCH] 功耗不对，基本逻辑实现
---
keil/include/src/TCPClient.c | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 494c5a8..cefb500 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -336,7 +336,7 @@
HIDO_CHAR acHeart[200];
HIDO_UINT32 u32HeartLen;
- u32HeartLen = HIDO_UtilSnprintf((HIDO_CHAR *)acHeart, sizeof(acHeart), "$XTB,%X,%d,%d,%02u%%,%d,%d.%d,%s",
+ u32HeartLen = HIDO_UtilSnprintf((HIDO_CHAR *)acHeart, sizeof(acHeart), "$XTB,%X,%02u%%,%d,%d,%d,%d.%d,%s",
g_com_map[DEV_ID], bat_percent,lounei_flag,0,0,g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID());
Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
@@ -352,7 +352,7 @@
void _4GAlarmUpload(uint8_t alarm)
{
alarm_type = alarm;
- TCPHeartBeatUpload();
+// TCPHeartBeatUpload();
if(alarm_type == 2)
alarm_type = 0;
}
@@ -399,7 +399,7 @@
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]);
@@ -482,18 +482,34 @@
return HIDO_OK;
}
-char str[19]= {"AT+IPR=115200;&W\r\n"};
+//char str[19]= {"AT+IPR=115200;&W\r\n"};
+////char str1[16]={"AT+IPR?;&W\r\n"};
+//void AIR780E_Reset(void)
+//{
+// 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);
+//}
+char str[17]= {"AT+IPR=9600;&W\r\n"};
void AIR780E_Reset(void)
{
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);
-
+// uart_send(UART_ID0, str,17, NULL);
+// Uart_ReConfigBaudRate(UART_ID_4G,9600);
}
+
uint8_t IfTCPConnected(void)
{
if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
--
Gitblit v1.9.3