From e41ccffbe9e4a9d59df51da01970e7ffc3848e95 Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期二, 06 五月 2025 16:53:46 +0800 Subject: [PATCH] 最新ota 加入ota语音 --- keil/include/components/internet/src/AIR780EDriver.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/keil/include/components/internet/src/AIR780EDriver.c b/keil/include/components/internet/src/AIR780EDriver.c index 735d536..a9c7df5 100644 --- a/keil/include/components/internet/src/AIR780EDriver.c +++ b/keil/include/components/internet/src/AIR780EDriver.c @@ -19,18 +19,18 @@ #include "HIDO_Util.h" #include "HIDO_Debug.h" #include "HIDO_Log.h" - +#include "DBG.h" /******************************************************************************* - * Macro * + * Macro * *******************************************************************************/ /* 串口相关 */ #define AIR780E_UART_TX_BUF_SIZE (100) /* 串口未使用DMA模式,不需要buff */ -#define AIR780E_UART_RX_BUF_SIZE (1024) -#define AIR780E_UART_TX_QUEUE_MEMBER_CNT 8 /* 串口未使用DMA模式,不需要 */ +#define AIR780E_UART_RX_BUF_SIZE (1024 * 2 + 512) +#define AIR780E_UART_TX_QUEUE_MEMBER_CNT 16 /* 串口未使用DMA模式,不需要 */ /* AT相关 */ -#define AIR780E_AT_SEND_BUF_SIZE (128) /* 发送的单条AT指令的最大长度 */ -#define AIR780E_AT_RECV_BUF_SIZE (128) /* 单挑AT指令 */ +#define AIR780E_AT_SEND_BUF_SIZE ((5 * 1024) + 512) /* 发送的单条AT指令的最大长度 */ +#define AIR780E_AT_RECV_BUF_SIZE ((5 * 1024) + 512) /* 单挑AT指令 */ /******************************************************************************* * Type Definition * @@ -215,6 +215,7 @@ * Author : 杜键 * Modified Date: : 2018年5月22日 *******************************************************************************/ +extern uint8_t log_4g_enable_flag; static HIDO_INT32 AIR780E_ReadLine(HIDO_ATLiteDeviceStruct *_pstATDevice) { static HIDO_UINT8 l_u8Mode = 0; @@ -333,12 +334,14 @@ { if((_pstATDevice->m_u32LineLen > 0) && (_pstATDevice->m_pcLineBuf[_pstATDevice->m_u32LineLen - 1] == '\n')) { - LOG_INFO(TRACE_MODULE_APP, "[AT Recv] %s", _pstATDevice->m_pcLineBuf); + if(log_4g_enable_flag&&DBG_GetMode() == DBG_MODE_SHELL) + LOG_INFO(TRACE_MODULE_APP, "[AT Recv] %s", _pstATDevice->m_pcLineBuf);//修改4G //HIDO_Debug( "[AT Recv] %s", _pstATDevice->m_pcLineBuf); } else { - LOG_INFO(TRACE_MODULE_APP, "[AT Recv] %s\r\n", _pstATDevice->m_pcLineBuf); + if(log_4g_enable_flag&&DBG_GetMode() == DBG_MODE_SHELL) + LOG_INFO(TRACE_MODULE_APP, "[AT Recv] %s\r\n", _pstATDevice->m_pcLineBuf);//修改4G //HIDO_Debug("[AT Recv] %s\r\n", _pstATDevice->m_pcLineBuf); } } @@ -367,12 +370,14 @@ if((_u32Len > 0) && (_pu8Data[_u32Len - 1] == '\n')) { // HIDO_Debug("[AT Send] %s", _pu8Data); - LOG_INFO(TRACE_MODULE_APP, "[AT Send] %s", _pu8Data); + if(log_4g_enable_flag&&DBG_GetMode() == DBG_MODE_SHELL) + LOG_INFO(TRACE_MODULE_APP, "[AT Send] %s", _pu8Data);//修改4G } else { // HIDO_Debug("[AT Send] %s\r\n", _pu8Data); - LOG_INFO(TRACE_MODULE_APP, "[AT Send] %s", _pu8Data); + if(log_4g_enable_flag&&DBG_GetMode() == DBG_MODE_SHELL) + LOG_INFO(TRACE_MODULE_APP, "[AT Send] %s", _pu8Data);//修改4G } } } @@ -411,8 +416,7 @@ *******************************************************************************/ HIDO_INT32 AIR780EDriver_PowerOn(void) { - air780_power_state = 1; - update_led_power_state(); + AIR780E_Reset(); return HIDO_OK; } @@ -521,6 +525,7 @@ * Author : 杜键 * Modified Date: : 2018年5月22日 *******************************************************************************/ +extern uint8_t log_4g_enable_flag; HIDO_INT32 AIR780EDriver_FSMDebug(HIDO_FSMStruct *_pstStateMachine, HIDO_INT32 _i32Level, HIDO_CHAR *_pcFmt, va_list _ap) { HIDO_CHAR acBuff[384]; @@ -529,8 +534,9 @@ // HIDO_Log(HIDO_LOG_LEVEL_DEBUG, "%s", acBuff); //HIDO_Debug(acBuff); - LOG_INFO(TRACE_MODULE_APP, acBuff); - +if(log_4g_enable_flag&&DBG_GetMode() == DBG_MODE_SHELL) + LOG_INFO(TRACE_MODULE_APP, acBuff);//修改4G + return HIDO_OK; } @@ -561,7 +567,6 @@ *******************************************************************************/ void AIR780EUartInit(void) { - ST_UartInit stUartInit; /* 串口初始化 */ -- Gitblit v1.9.3