From ff27ffd4106d12d68f4da4259279f948e512fc69 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期四, 24 七月 2025 10:28:30 +0800
Subject: [PATCH] 修改网络类型切换，用宏定义控制网络切换，V2.13
---
keil/include/components/internet/src/AIR780EFSM.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/keil/include/components/internet/src/AIR780EFSM.c b/keil/include/components/internet/src/AIR780EFSM.c
index c53bbdd..ad3b066 100644
--- a/keil/include/components/internet/src/AIR780EFSM.c
+++ b/keil/include/components/internet/src/AIR780EFSM.c
@@ -852,18 +852,19 @@
{ "AT+CIPMUX=1\r\n", AT_GENERAL_TIMEOUT_TIME, AT_CMD_RESULT_OK },
{ "AT*I\r\n", AT_GENERAL_TIMEOUT_TIME, AT_CMD_RESULT_OK },
#ifndef _4G_ZHUANWANG
- { "AT+CSTT=\"%s\",\"\",\"\"\r\n", 60000, AT_CMD_RESULT_OK | AT_CMD_RESULT_ERROR },
- { "AT+CIICR\r\n", 60000, AT_CMD_RESULT_OK | AT_CMD_RESULT_ERROR },
- { "AT+CIFSR\r\n", 1000, AT_CMD_RESULT_OK | AT_CMD_RESULT_TIMEOUT },
+ { "AT+CSTT=\"%s\",\"\",\"\"\r\n", 60000, AT_CMD_RESULT_OK | AT_CMD_RESULT_ERROR },
+ { "AT+CIICR\r\n", 60000, AT_CMD_RESULT_OK | AT_CMD_RESULT_ERROR },
+ { "AT+CIFSR\r\n", 1000, AT_CMD_RESULT_OK | AT_CMD_RESULT_TIMEOUT },
#endif
-#ifdef _4G_115200
-
-#else
+#ifndef _4G_115200
{ "AT+POWERMODE=\"PRO\"\r\n", 5000, AT_CMD_RESULT_OK | AT_CMD_RESULT_TIMEOUT },
- { "AT+POWERMODE?\r\n", AT_GENERAL_TIMEOUT_TIME, AT_CMD_RESULT_OK },
+ { "AT+POWERMODE?\r\n", AT_GENERAL_TIMEOUT_TIME, AT_CMD_RESULT_OK },
#endif
+#ifndef TCP_CONNECT
+ { "AT+CIPSTART=?\r\n", AT_GENERAL_TIMEOUT_TIME, AT_CMD_RESULT_OK },
+#endif
};
-
+#ifndef _4G_ZHUANWANG
pcIMSI = Module_GetIMSI();
if(strncmp(pcIMSI, "46000", 5) == 0 || strncmp(pcIMSI, "46002", 5) == 0)
{
@@ -881,7 +882,7 @@
{
HIDO_UtilSnprintf(acAPN, sizeof(acAPN), "CTNET");
}
-
+#endif
switch (_u32Event)
{
case HIDO_EVENT_ENTRY:
--
Gitblit v1.9.3