optimize connection_adapter 4g and bluetooth kconfig

This commit is contained in:
Liu_Weichao 2022-08-25 16:05:03 +08:00
parent 76017d0d0d
commit 22de65aa20
3 changed files with 36 additions and 39 deletions

View File

@ -3,13 +3,19 @@ config ADAPTER_4G_EC200T
default "ec200t" default "ec200t"
if ADD_XIZI_FETURES if ADD_XIZI_FETURES
config ADAPTER_EC200T_PWRKEY config ADAPTER_EC200T_USING_PWRKEY
int "EC200T PWRKEY pin number" bool "EC200T using PWRKEY pin number"
default "97" default n
config ADAPTER_EC200T_PIN_DRIVER if ADAPTER_EC200T_USING_PWRKEY
string "EC200T device pin driver path" config ADAPTER_EC200T_PWRKEY
default "/dev/pin_dev" int "EC200T PWRKEY pin number"
default "97"
config ADAPTER_EC200T_PIN_DRIVER
string "EC200T device pin driver path"
default "/dev/pin_dev"
endif
config ADAPTER_EC200T_DRIVER_EXTUART config ADAPTER_EC200T_DRIVER_EXTUART
bool "Using extra uart to support 4G" bool "Using extra uart to support 4G"
@ -35,7 +41,6 @@ if ADD_NUTTX_FETURES
config ADAPTER_EC200T_DRIVER config ADAPTER_EC200T_DRIVER
string "EC200T device uart driver path" string "EC200T device uart driver path"
default "/dev/ttyS8" default "/dev/ttyS8"
endif endif
if ADD_RTTHREAD_FETURES if ADD_RTTHREAD_FETURES

View File

@ -38,14 +38,9 @@
#define TRY_TIMES 10 #define TRY_TIMES 10
#ifdef ADD_NUTTX_FETURES static void Ec200tPowerSet(void)
static void Ec200tPowerSet(void){ return; } {
#else #ifdef ADAPTER_EC200T_USING_PWRKEY
#ifdef ADD_RTTHREAD_FETURES
static void Ec200tPowerSet(void){ return; }
#else
static void Ec200tPowerSet(void)
{
int pin_fd; int pin_fd;
pin_fd = PrivOpen(ADAPTER_EC200T_PIN_DRIVER, O_RDWR); pin_fd = PrivOpen(ADAPTER_EC200T_PIN_DRIVER, O_RDWR);
if (pin_fd < 0) { if (pin_fd < 0) {
@ -76,9 +71,8 @@ static void Ec200tPowerSet(void){ return; }
PrivClose(pin_fd); PrivClose(pin_fd);
PrivTaskDelay(10000); PrivTaskDelay(10000);
}
#endif
#endif #endif
}
static int Ec200tOpen(struct Adapter *adapter) static int Ec200tOpen(struct Adapter *adapter)
{ {
@ -148,7 +142,6 @@ out:
return ret; return ret;
} }
#ifdef ADD_NUTTX_FETURES #ifdef ADD_NUTTX_FETURES
static int Ec200tIoctl(struct Adapter *adapter, int cmd, void *args){ return 0;} static int Ec200tIoctl(struct Adapter *adapter, int cmd, void *args){ return 0;}
#else #else
@ -183,7 +176,6 @@ static int Ec200tIoctl(struct Adapter *adapter, int cmd, void *args)
ioctl_cfg.args = &serial_cfg; ioctl_cfg.args = &serial_cfg;
PrivIoctl(adapter->fd, OPE_INT, &ioctl_cfg); PrivIoctl(adapter->fd, OPE_INT, &ioctl_cfg);
Ec200tPowerSet(); Ec200tPowerSet();
return 0; return 0;

View File

@ -21,32 +21,32 @@
#include <adapter.h> #include <adapter.h>
#include <at_agent.h> #include <at_agent.h>
#define HC08_DETECT_CMD "AT" #define HC08_DETECT_CMD "AT"
#define HC08_DEFAULT_CMD "AT+DEFAULT" #define HC08_DEFAULT_CMD "AT+DEFAULT"
#define HC08_RESET_CMD "AT+RESET" #define HC08_RESET_CMD "AT+RESET"
#define HC08_CLEAR_CMD "AT+CLEAR" #define HC08_CLEAR_CMD "AT+CLEAR"
#define HC08_GET_DEVICE_INFO "AT+RX" #define HC08_GET_DEVICE_INFO "AT+RX"
#define HC08_GET_BAUDRATE_CMD "AT+BAUD=?" #define HC08_GET_BAUDRATE_CMD "AT+BAUD=?"
#define HC08_SET_BAUDRATE_CMD "AT+BAUD=%u" #define HC08_SET_BAUDRATE_CMD "AT+BAUD=%u"
#define HC08_GET_CONNECTABLE "AT+CONT=?" #define HC08_GET_CONNECTABLE "AT+CONT=?"
#define HC08_SET_CONNECTABLE "AT+CONT=%s" #define HC08_SET_CONNECTABLE "AT+CONT=%s"
#define HC08_GET_ROLE_CMD "AT+ROLE=?" #define HC08_GET_ROLE_CMD "AT+ROLE=?"
#define HC08_SET_ROLE_CMD "AT+ROLE=%s" #define HC08_SET_ROLE_CMD "AT+ROLE=%s"
#define HC08_GET_ADDR_CMD "AT+ADDR=?" #define HC08_GET_ADDR_CMD "AT+ADDR=?"
#define HC08_SET_ADDR_CMD "AT+ADDR=%s" #define HC08_SET_ADDR_CMD "AT+ADDR=%s"
#define HC08_GET_NAME_CMD "AT+NAME=%s" #define HC08_GET_NAME_CMD "AT+NAME=%s"
#define HC08_SET_NAME_CMD "AT+NAME=?" #define HC08_SET_NAME_CMD "AT+NAME=?"
#define HC08_GET_LUUID_CMD "AT+LUUID=?" #define HC08_GET_LUUID_CMD "AT+LUUID=?"
#define HC08_SET_LUUID_CMD "AT+LUUID=%u" #define HC08_SET_LUUID_CMD "AT+LUUID=%u"
#define HC08_GET_SUUID_CMD "AT+SUUID=?" #define HC08_GET_SUUID_CMD "AT+SUUID=?"
#define HC08_SET_SUUID_CMD "AT+SUUID=%u" #define HC08_SET_SUUID_CMD "AT+SUUID=%u"
#define HC08_GET_TUUID_CMD "AT+TUUID=?" #define HC08_GET_TUUID_CMD "AT+TUUID=?"
#define HC08_SET_TUUID_CMD "AT+TUUID=%u" #define HC08_SET_TUUID_CMD "AT+TUUID=%u"
#define HC08_OK_RESP "OK" #define HC08_OK_RESP "OK"
#define HC08_CMD_STR_DEFAULT_SIZE 64 #define HC08_CMD_STR_DEFAULT_SIZE 64
#define HC08_RESP_DEFAULT_SIZE 64 #define HC08_RESP_DEFAULT_SIZE 64
enum Hc08AtCmd enum Hc08AtCmd