diff --git a/APP_Framework/Framework/connection/4g/ec200t/Kconfig b/APP_Framework/Framework/connection/4g/ec200t/Kconfig index 404fb381f..f5760fba4 100644 --- a/APP_Framework/Framework/connection/4g/ec200t/Kconfig +++ b/APP_Framework/Framework/connection/4g/ec200t/Kconfig @@ -3,13 +3,19 @@ config ADAPTER_4G_EC200T default "ec200t" if ADD_XIZI_FETURES - config ADAPTER_EC200T_PWRKEY - int "EC200T PWRKEY pin number" - default "97" + config ADAPTER_EC200T_USING_PWRKEY + bool "EC200T using PWRKEY pin number" + default n - config ADAPTER_EC200T_PIN_DRIVER - string "EC200T device pin driver path" - default "/dev/pin_dev" + if ADAPTER_EC200T_USING_PWRKEY + config ADAPTER_EC200T_PWRKEY + 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 bool "Using extra uart to support 4G" @@ -35,7 +41,6 @@ if ADD_NUTTX_FETURES config ADAPTER_EC200T_DRIVER string "EC200T device uart driver path" default "/dev/ttyS8" - endif if ADD_RTTHREAD_FETURES diff --git a/APP_Framework/Framework/connection/4g/ec200t/ec200t.c b/APP_Framework/Framework/connection/4g/ec200t/ec200t.c index 296a193f5..cef26254a 100644 --- a/APP_Framework/Framework/connection/4g/ec200t/ec200t.c +++ b/APP_Framework/Framework/connection/4g/ec200t/ec200t.c @@ -38,14 +38,9 @@ #define TRY_TIMES 10 -#ifdef ADD_NUTTX_FETURES -static void Ec200tPowerSet(void){ return; } -#else - #ifdef ADD_RTTHREAD_FETURES - static void Ec200tPowerSet(void){ return; } - #else - static void Ec200tPowerSet(void) - { +static void Ec200tPowerSet(void) +{ +#ifdef ADAPTER_EC200T_USING_PWRKEY int pin_fd; pin_fd = PrivOpen(ADAPTER_EC200T_PIN_DRIVER, O_RDWR); if (pin_fd < 0) { @@ -76,9 +71,8 @@ static void Ec200tPowerSet(void){ return; } PrivClose(pin_fd); PrivTaskDelay(10000); - } - #endif #endif +} static int Ec200tOpen(struct Adapter *adapter) { @@ -148,7 +142,6 @@ out: return ret; } - #ifdef ADD_NUTTX_FETURES static int Ec200tIoctl(struct Adapter *adapter, int cmd, void *args){ return 0;} #else @@ -183,7 +176,6 @@ static int Ec200tIoctl(struct Adapter *adapter, int cmd, void *args) ioctl_cfg.args = &serial_cfg; PrivIoctl(adapter->fd, OPE_INT, &ioctl_cfg); - Ec200tPowerSet(); return 0; diff --git a/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c b/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c index f261d3ba5..ab6a42ef8 100644 --- a/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c +++ b/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c @@ -21,32 +21,32 @@ #include #include -#define HC08_DETECT_CMD "AT" -#define HC08_DEFAULT_CMD "AT+DEFAULT" -#define HC08_RESET_CMD "AT+RESET" -#define HC08_CLEAR_CMD "AT+CLEAR" +#define HC08_DETECT_CMD "AT" +#define HC08_DEFAULT_CMD "AT+DEFAULT" +#define HC08_RESET_CMD "AT+RESET" +#define HC08_CLEAR_CMD "AT+CLEAR" #define HC08_GET_DEVICE_INFO "AT+RX" -#define HC08_GET_BAUDRATE_CMD "AT+BAUD=?" -#define HC08_SET_BAUDRATE_CMD "AT+BAUD=%u" +#define HC08_GET_BAUDRATE_CMD "AT+BAUD=?" +#define HC08_SET_BAUDRATE_CMD "AT+BAUD=%u" #define HC08_GET_CONNECTABLE "AT+CONT=?" #define HC08_SET_CONNECTABLE "AT+CONT=%s" -#define HC08_GET_ROLE_CMD "AT+ROLE=?" -#define HC08_SET_ROLE_CMD "AT+ROLE=%s" -#define HC08_GET_ADDR_CMD "AT+ADDR=?" -#define HC08_SET_ADDR_CMD "AT+ADDR=%s" -#define HC08_GET_NAME_CMD "AT+NAME=%s" -#define HC08_SET_NAME_CMD "AT+NAME=?" -#define HC08_GET_LUUID_CMD "AT+LUUID=?" -#define HC08_SET_LUUID_CMD "AT+LUUID=%u" -#define HC08_GET_SUUID_CMD "AT+SUUID=?" -#define HC08_SET_SUUID_CMD "AT+SUUID=%u" -#define HC08_GET_TUUID_CMD "AT+TUUID=?" -#define HC08_SET_TUUID_CMD "AT+TUUID=%u" +#define HC08_GET_ROLE_CMD "AT+ROLE=?" +#define HC08_SET_ROLE_CMD "AT+ROLE=%s" +#define HC08_GET_ADDR_CMD "AT+ADDR=?" +#define HC08_SET_ADDR_CMD "AT+ADDR=%s" +#define HC08_GET_NAME_CMD "AT+NAME=%s" +#define HC08_SET_NAME_CMD "AT+NAME=?" +#define HC08_GET_LUUID_CMD "AT+LUUID=?" +#define HC08_SET_LUUID_CMD "AT+LUUID=%u" +#define HC08_GET_SUUID_CMD "AT+SUUID=?" +#define HC08_SET_SUUID_CMD "AT+SUUID=%u" +#define HC08_GET_TUUID_CMD "AT+TUUID=?" +#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 enum Hc08AtCmd