diff --git a/usersrc/atcmd.c b/usersrc/atcmd.c index aa11db7..6f87bf2 100644 --- a/usersrc/atcmd.c +++ b/usersrc/atcmd.c @@ -3,15 +3,11 @@ /* AT指令表 */ const AT_cmd_func at_cmd_func[] = { {AT_CMD_TEST, "AT", at_cmd_test}, - {AT_CMD_NAME, "AT+NAME=", at_cmd_name}, - {AT_CMD_DISA, "AT+DISC", NULL}, - {AT_CMD_TX_POWER, "AT+TX=", NULL}, - {AT_CMD_ADV_INTERVAL, "AT+ADV_INTERVAL=", NULL}, - {AT_CMD_CON_INTERVAL, "AT+CON_INTERVAL=", NULL}, - {AT_CMD_ADV_ONOFF, "AT_ADV=", NULL}, - {AT_GET_VER, "AT+VERSION=", NULL}, - {AT_GET_CON_STATE, "AT+STATE", NULL}, - {AT_CMD_UART_CFG, "AT+UART_CFG=", NULL}, + {AT_CMD_IP, "AT+IP=", at_cmd_ip}, + {AT_CMD_GW, "AT+GW", NULL}, + {AT_CMD_NETMASK, "AT+NETMASK=", NULL}, + {AT_CMD_NETMODULE, "AT+NETMODULE=", NULL}, + {AT_END, NULL, NULL}}; unsigned int mstrlen(const char *s) @@ -51,7 +47,7 @@ unsigned char at_cmd_test(unsigned char *p, unsigned char len) return 0; } -unsigned char at_cmd_name(unsigned char *p, unsigned char len) +unsigned char at_cmd_ip(unsigned char *p, unsigned char len) { if (*p == '?') diff --git a/usersrc/atcmd.h b/usersrc/atcmd.h index 9770476..249156a 100644 --- a/usersrc/atcmd.h +++ b/usersrc/atcmd.h @@ -9,16 +9,11 @@ typedef enum { - AT_CMD_TEST = 0, /* 测试指令 */ - AT_CMD_NAME, /* 设置名称 */ - AT_CMD_DISA, /* 断开当前连接 */ - AT_CMD_TX_POWER, /* 设置发送功率 */ - AT_CMD_ADV_INTERVAL, /* 设置广播间隔 */ - AT_CMD_CON_INTERVAL, /* 设置连接间隔 */ - AT_CMD_ADV_ONOFF, /* 设置打开、关闭广播 */ - AT_GET_VER, /* 获取版本号 */ - AT_GET_CON_STATE, /* 获取连接状态 */ - AT_CMD_UART_CFG, /* 配置UART参数 */ + AT_CMD_TEST = 0, /* 测试指令 */ + AT_CMD_IP, /* 设置IP */ + AT_CMD_GW, /* 设置网关 */ + AT_CMD_NETMASK, /* 设置子网掩码 */ + AT_CMD_NETMODULE, /* 设置网络模式 */ AT_END } AT_Cmd; @@ -35,6 +30,6 @@ typedef struct unsigned int mstrlen(const char *s); int mstrncmp(const char *s1, const char *s2, int n); unsigned char at_cmd_test(unsigned char *p, unsigned char len); -unsigned char at_cmd_name(unsigned char *p, unsigned char len); +unsigned char at_cmd_ip(unsigned char *p, unsigned char len); unsigned char AT_cmd_search(unsigned char *p, unsigned char len); unsigned char at_cmd_parse(unsigned char *p, unsigned char len);