diff --git a/applications/drv_ec800k.c b/applications/drv_ec800k.c index c5e5a42..a971c5a 100644 --- a/applications/drv_ec800k.c +++ b/applications/drv_ec800k.c @@ -294,6 +294,12 @@ int16_t BSP_LTE_GetCEREG(int16_t retry) { } else if (0 == BSP_LTE_SendCmd(AT_CEREG, "+CEREG: 0,5\r\n\r\nOK", DEFAULT_ERROR, LTE_CMD_WAIT_LONG)) { return 0; + } else if (0 == BSP_LTE_SendCmd(AT_CEREG, CEREG_OK_2, DEFAULT_ERROR, + LTE_CMD_WAIT_LONG)) { + return 0; + } else if (0 == BSP_LTE_SendCmd(AT_CEREG, DEFAULT_EXPECT, DEFAULT_ERROR, + LTE_CMD_WAIT_LONG)) { + return 0; } retry--; } while (retry); @@ -372,7 +378,8 @@ void BSP_LTE_Config(void) { } /*配置应用场景*/ BSP_LTE_SendCmd(AT_QICSGP, DEFAULT_EXPECT, DEFAULT_ERROR, LTE_CMD_WAIT_LONG); - + //BSP_LTE_SendCmd(AT_QICSGP_CTIOT, DEFAULT_EXPECT, DEFAULT_ERROR, LTE_CMD_WAIT_LONG); + //BSP_LTE_SendCmd(AT_QICSGP_CMTDS, DEFAULT_EXPECT, DEFAULT_ERROR, LTE_CMD_WAIT_LONG); /*定义 PDP 上下文*/ BSP_LTE_SendCmd("AT+CGDCONT?\r\n", DEFAULT_EXPECT, DEFAULT_ERROR, LTE_CMD_WAIT_NORMAL); diff --git a/applications/drv_ec800k.h b/applications/drv_ec800k.h index 2a33db6..0ae2850 100644 --- a/applications/drv_ec800k.h +++ b/applications/drv_ec800k.h @@ -31,11 +31,13 @@ extern "C" { #define LTE_CMD_WAIT_LONG (3000) #define LTE_CMD_WAIT_LLONG (7000) -#define DEFAULT_EXPECT "\r\nOK\r\n" +//#define DEFAULT_EXPECT "\r\nOK\r\n" +#define DEFAULT_EXPECT "OK" #define DEFAULT_ERROR "ERROR" #define DEFAULT_RDY "READY" #define CGATT_OK "+CGATT: 1\r\n\r\nOK" #define CEREG_OK "+CEREG: 0,1\r\n\r\nOK" +#define CEREG_OK_2 "+CEREG: 0,1" #define CONNECTE_OK "CONNECT" #define CLOSED "closed" #define SERVER_DISCONNECTED "SERVER DISCONNECTED:0" @@ -103,7 +105,8 @@ extern "C" { // #define AT_QICSGP // "AT+QICSGP=1,1,\"cmnbiot\",\"web\",\"password\",0\r\n" #define AT_QICSGP_CMNET "AT+QICSGP=1,1,\"cmnet\",\"\",\"\"\r\n" - +#define AT_QICSGP_CTIOT "AT+QICSGP=1,1,\"ctiot\",\"\",\"\"\r\n" +#define AT_QICSGP_CMTDS "AT+QICSGP=1,1,\"cmtds\",\"\",\"\"\r\n" /*韩国APN*/ #define AT_QICSGP_SK "AT+QICSGP=1,1,\"lte.sktelecom.com \",\"\",\"\"\r\n"