From 772f4fb6bb962868b36d838bbef446e5aee3c864 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期六, 05 七月 2025 14:24:44 +0800
Subject: [PATCH] commap 大小从512改成100，修改休眠逻辑，休眠标志位触发之后，先过1秒关闭4g，2秒之后再进入休眠模式
---
keil/include/src/TCPClient.c | 89 ++++++++++++++++++++++----------------------
1 files changed, 45 insertions(+), 44 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 5f35ca4..a72a78b 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -369,56 +369,57 @@
PCA9555_Set_One_Value_Output(TTS_ENABLE,1);//输出高电平切换为5V输入
delay_ms(100);
WT588E_PLAY(atoi(apcSplitStr[2]));
+ temp= HIDO_UtilStrToInt(apcSplitStr[2]);
buffer_len = sprintf(send_buffer,"$Receivevoice,");
- 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;
Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,buffer_len);
}
}
- else if (STRCMP(_u8Data, "$set_gpsuwbpara,") == 0)
- {
- u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
- uint16_t buffer_len,datalen;
- char send_buffer[20]={0};
- if (u32SplitCnt < 6)
- {
- return HIDO_ERR;
- }
- if (HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
- {
- HIDO_INT32 gpskaiguan,uwbkaiguan,gpspinlv,uwbpinlv,gpsbaudrate1;
- gpskaiguan= HIDO_UtilStrToInt(apcSplitStr[2]);
- g_com_map[GPSENBLE] = gpskaiguan;
- uwbkaiguan= HIDO_UtilStrToInt(apcSplitStr[3]);
- g_com_map[UWBENBLE] = uwbkaiguan;
- gpspinlv= HIDO_UtilStrToInt(apcSplitStr[4]);
- g_com_map[GPSFrequency] = gpspinlv;
- uwbpinlv= HIDO_UtilStrToInt(apcSplitStr[5]);
- g_com_map[UWBFrequency] = uwbpinlv;
- 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)
- &&(g_com_map[UWBFrequency]==1||g_com_map[UWBFrequency]==3||g_com_map[UWBFrequency]==5||g_com_map[UWBFrequency]==10)
- &&(gpsbaudrate1==9600||gpsbaudrate1==115200)
- )
- {
- save_com_map_to_flash();
-// Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,buffer_len);
- g_com_map[CNT_RESTART] = 1;
- }
- else
- {
- Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,10);
- }
- }
- }
+// else if (STRCMP(_u8Data, "$set_gpsuwbpara,") == 0)
+// {
+// u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
+// uint16_t buffer_len,datalen;
+// char send_buffer[20]={0};
+// if (u32SplitCnt < 6)
+// {
+// return HIDO_ERR;
+// }
+// if (HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
+// {
+// HIDO_INT32 gpskaiguan,uwbkaiguan,gpspinlv,uwbpinlv,gpsbaudrate1;
+// gpskaiguan= HIDO_UtilStrToInt(apcSplitStr[2]);
+// g_com_map[GPSENBLE] = gpskaiguan;
+// uwbkaiguan= HIDO_UtilStrToInt(apcSplitStr[3]);
+// g_com_map[UWBENBLE] = uwbkaiguan;
+// gpspinlv= HIDO_UtilStrToInt(apcSplitStr[4]);
+// g_com_map[GPSFrequency] = gpspinlv;
+// uwbpinlv= HIDO_UtilStrToInt(apcSplitStr[5]);
+// g_com_map[UWBFrequency] = uwbpinlv;
+// 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)
+// &&(g_com_map[UWBFrequency]==1||g_com_map[UWBFrequency]==3||g_com_map[UWBFrequency]==5||g_com_map[UWBFrequency]==10)
+// &&(gpsbaudrate1==9600||gpsbaudrate1==115200)
+// )
+// {
+// save_com_map_to_flash();
+//// Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,buffer_len);
+// g_com_map[CNT_RESTART] = 1;
+// }
+// else
+// {
+// Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,10);
+// }
+// }
+// }
else if (STRCMP(_u8Data, "$read_gpsuwbpara,") == 0)
{
u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
@@ -904,7 +905,7 @@
return HIDO_OK;
}
-#ifdef _GPS_115200
+#ifdef _4G_115200
char str[19]= {"AT+IPR=115200;&W\r\n"};
void AIR780E_Reset(void)
{
--
Gitblit v1.9.3