diff --git a/APP_Framework/Framework/connection/4g/ec200t/ec200t.c b/APP_Framework/Framework/connection/4g/ec200t/ec200t.c index cef26254a..145ea2d48 100644 --- a/APP_Framework/Framework/connection/4g/ec200t/ec200t.c +++ b/APP_Framework/Framework/connection/4g/ec200t/ec200t.c @@ -167,6 +167,7 @@ static int Ec200tIoctl(struct Adapter *adapter, int cmd, void *args) serial_cfg.serial_bit_order = STOP_BITS_1; serial_cfg.serial_invert_mode = NRZ_NORMAL; #ifdef ADAPTER_EC200T_DRIVER_EXT_PORT + serial_cfg.is_ext_uart = 1; serial_cfg.ext_uart_no = ADAPTER_EC200T_DRIVER_EXT_PORT; serial_cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c b/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c index ab6a42ef8..1798d5e2f 100644 --- a/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c +++ b/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c @@ -239,6 +239,7 @@ static int Hc08Open(struct Adapter *adapter) serial_cfg.serial_bit_order = STOP_BITS_1; serial_cfg.serial_invert_mode = NRZ_NORMAL; #ifdef ADAPTER_HC08_DRIVER_EXT_PORT + serial_cfg.is_ext_uart = 1; serial_cfg.ext_uart_no = ADAPTER_HC08_DRIVER_EXT_PORT; serial_cfg.port_configure = PORT_CFG_INIT; #endif @@ -330,6 +331,7 @@ static int Hc08Ioctl(struct Adapter *adapter, int cmd, void *args) serial_cfg.serial_bit_order = STOP_BITS_1; serial_cfg.serial_invert_mode = NRZ_NORMAL; #ifdef ADAPTER_HC08_DRIVER_EXT_PORT + serial_cfg.is_ext_uart = 1; serial_cfg.ext_uart_no = ADAPTER_HC08_DRIVER_EXT_PORT; serial_cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/connection/ethernet/hfa21_ethernet/hfa21_ethernet.c b/APP_Framework/Framework/connection/ethernet/hfa21_ethernet/hfa21_ethernet.c index ada295ecc..c75e4e26b 100644 --- a/APP_Framework/Framework/connection/ethernet/hfa21_ethernet/hfa21_ethernet.c +++ b/APP_Framework/Framework/connection/ethernet/hfa21_ethernet/hfa21_ethernet.c @@ -402,6 +402,7 @@ static int Hfa21EthernetIoctl(struct Adapter *adapter, int cmd, void *args) serial_cfg.serial_bit_order = BIT_ORDER_LSB; serial_cfg.serial_invert_mode = NRZ_NORMAL; #ifdef ADAPTER_HFA21_DRIVER_EXT_PORT + serial_cfg.is_ext_uart = 1; serial_cfg.ext_uart_no = ADAPTER_HFA21_DRIVER_EXT_PORT; serial_cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/connection/lora/e220/e220.c b/APP_Framework/Framework/connection/lora/e220/e220.c index 880ba9e48..9f4f75d72 100644 --- a/APP_Framework/Framework/connection/lora/e220/e220.c +++ b/APP_Framework/Framework/connection/lora/e220/e220.c @@ -359,6 +359,7 @@ static int E220Open(struct Adapter *adapter) /*aiit board use ch438, so it needs more serial configuration*/ #ifdef ADAPTER_E220_DRIVER_EXTUART + cfg.is_ext_uart = 1; cfg.ext_uart_no = ADAPTER_E220_DRIVER_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/connection/nbiot/bc28/bc28.c b/APP_Framework/Framework/connection/nbiot/bc28/bc28.c index e290172ba..33a2205b4 100644 --- a/APP_Framework/Framework/connection/nbiot/bc28/bc28.c +++ b/APP_Framework/Framework/connection/nbiot/bc28/bc28.c @@ -59,6 +59,7 @@ static int BC28UartOpen(struct Adapter *adapter) /*aiit board use ch438, so it needs more serial configuration*/ #ifdef ADAPTER_BC28_DRIVER_EXTUART + cfg.is_ext_uart = 1; cfg.ext_uart_no = ADAPTER_BC28_DRIVER_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/connection/wifi/esp07s_wifi/esp07s_wifi.c b/APP_Framework/Framework/connection/wifi/esp07s_wifi/esp07s_wifi.c index 36c943b73..7b015f2ca 100755 --- a/APP_Framework/Framework/connection/wifi/esp07s_wifi/esp07s_wifi.c +++ b/APP_Framework/Framework/connection/wifi/esp07s_wifi/esp07s_wifi.c @@ -82,6 +82,7 @@ static int Esp07sUartOpen(struct Adapter *adapter) cfg.serial_buffer_size = SERIAL_RB_BUFSZ; #ifdef ADAPTER_ESP07S_DRIVER_EXT_PORT + cfg.is_ext_uart = 1; cfg.ext_uart_no = ADAPTER_ESP07S_DRIVER_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif @@ -512,6 +513,7 @@ static int Esp07sWifiIoctl(struct Adapter *adapter, int cmd, void *args) cfg.serial_buffer_size = SERIAL_RB_BUFSZ; #ifdef ADAPTER_ESP07S_DRIVER_EXT_PORT + cfg.is_ext_uart = 1; cfg.ext_uart_no = ADAPTER_ESP07S_DRIVER_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/connection/wifi/hfa21_wifi/hfa21_wifi.c b/APP_Framework/Framework/connection/wifi/hfa21_wifi/hfa21_wifi.c index 2cc263416..00972660c 100755 --- a/APP_Framework/Framework/connection/wifi/hfa21_wifi/hfa21_wifi.c +++ b/APP_Framework/Framework/connection/wifi/hfa21_wifi/hfa21_wifi.c @@ -474,6 +474,7 @@ static int Hfa21WifiIoctl(struct Adapter *adapter, int cmd, void *args) serial_cfg.serial_bit_order = BIT_ORDER_LSB; serial_cfg.serial_invert_mode = NRZ_NORMAL; #ifdef ADAPTER_HFA21_DRIVER_EXT_PORT + serial_cfg.is_ext_uart = 1; serial_cfg.ext_uart_no = ADAPTER_HFA21_DRIVER_EXT_PORT; serial_cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/connection/zigbee/e18/e18.c b/APP_Framework/Framework/connection/zigbee/e18/e18.c index c8138d07b..003db86b3 100644 --- a/APP_Framework/Framework/connection/zigbee/e18/e18.c +++ b/APP_Framework/Framework/connection/zigbee/e18/e18.c @@ -108,6 +108,7 @@ static int E18UartOpen(struct Adapter *adapter) /*aiit board use ch438, so it needs more serial configuration*/ #ifdef ADAPTER_E18_DRIVER_EXTUART + cfg.is_ext_uart = 1; cfg.ext_uart_no = ADAPTER_E18_DRIVER_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/sensor/ch4/as830/as830.c b/APP_Framework/Framework/sensor/ch4/as830/as830.c index 49ad1fc17..81cc37e19 100644 --- a/APP_Framework/Framework/sensor/ch4/as830/as830.c +++ b/APP_Framework/Framework/sensor/ch4/as830/as830.c @@ -65,6 +65,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.serial_bit_order = 0; cfg.serial_invert_mode = 0; #ifdef SENSOR_AS830_DRIVER_EXTUART + cfg.is_ext_uart = 1; cfg.ext_uart_no = SENSOR_DEVICE_AS830_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/sensor/co2/g8s/g8s.c b/APP_Framework/Framework/sensor/co2/g8s/g8s.c index 89c7583bc..a9030ab7d 100644 --- a/APP_Framework/Framework/sensor/co2/g8s/g8s.c +++ b/APP_Framework/Framework/sensor/co2/g8s/g8s.c @@ -70,6 +70,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.serial_bit_order = 0; cfg.serial_invert_mode = 0; #ifdef SENSOR_G8S_DRIVER_EXTUART + cfg.is_ext_uart = 1; cfg.ext_uart_no = SENSOR_DEVICE_G8S_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/sensor/co2/zg09/zg09.c b/APP_Framework/Framework/sensor/co2/zg09/zg09.c index d18f96f92..e74a84373 100644 --- a/APP_Framework/Framework/sensor/co2/zg09/zg09.c +++ b/APP_Framework/Framework/sensor/co2/zg09/zg09.c @@ -76,6 +76,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.serial_bit_order = 0; cfg.serial_invert_mode = 0; #ifdef SENSOR_ZG09_DRIVER_EXTUART + cfg.is_ext_uart = 1; cfg.ext_uart_no = SENSOR_DEVICE_ZG09_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/sensor/hcho/tb600b_wq_hcho1os/tb600b_wq_hcho1os.c b/APP_Framework/Framework/sensor/hcho/tb600b_wq_hcho1os/tb600b_wq_hcho1os.c index d1c103c8e..bb38f7f78 100644 --- a/APP_Framework/Framework/sensor/hcho/tb600b_wq_hcho1os/tb600b_wq_hcho1os.c +++ b/APP_Framework/Framework/sensor/hcho/tb600b_wq_hcho1os/tb600b_wq_hcho1os.c @@ -66,6 +66,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.serial_bit_order = 0; cfg.serial_invert_mode = 0; #ifdef SENSOR_TB600B_WQ_HCHO1OS_DRIVER_EXTUART + cfg.is_ext_uart = 1; cfg.ext_uart_no = SENSOR_DEVICE_TB600B_WQ_HCHO1OS_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/sensor/iaq/tb600b_iaq10/tb600b_iaq10.c b/APP_Framework/Framework/sensor/iaq/tb600b_iaq10/tb600b_iaq10.c index 14e2e13bd..3a7cf516b 100644 --- a/APP_Framework/Framework/sensor/iaq/tb600b_iaq10/tb600b_iaq10.c +++ b/APP_Framework/Framework/sensor/iaq/tb600b_iaq10/tb600b_iaq10.c @@ -73,6 +73,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.serial_bit_order = 0; cfg.serial_invert_mode = 0; #ifdef SENSOR_TB600B_IAQ10_DRIVER_EXTUART + cfg.is_ext_uart = 1; cfg.ext_uart_no = SENSOR_DEVICE_TB600B_IAQ10_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/sensor/pm/ps5308/ps5308.c b/APP_Framework/Framework/sensor/pm/ps5308/ps5308.c index d46a5a575..6634d8c55 100644 --- a/APP_Framework/Framework/sensor/pm/ps5308/ps5308.c +++ b/APP_Framework/Framework/sensor/pm/ps5308/ps5308.c @@ -98,6 +98,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.serial_bit_order = 0; cfg.serial_invert_mode = 0; #ifdef SENSOR_PS5308_DRIVER_EXTUART + cfg.is_ext_uart = 1; cfg.ext_uart_no = SENSOR_DEVICE_PS5308_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/sensor/tvoc/tb600b_tvoc10/tb600b_tvoc10.c b/APP_Framework/Framework/sensor/tvoc/tb600b_tvoc10/tb600b_tvoc10.c index 27847e0db..926ea8693 100644 --- a/APP_Framework/Framework/sensor/tvoc/tb600b_tvoc10/tb600b_tvoc10.c +++ b/APP_Framework/Framework/sensor/tvoc/tb600b_tvoc10/tb600b_tvoc10.c @@ -66,6 +66,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.serial_bit_order = 0; cfg.serial_invert_mode = 0; #ifdef SENSOR_TB600B_TVOC10_DRIVER_EXTUART + cfg.is_ext_uart = 1; cfg.ext_uart_no = SENSOR_DEVICE_TB600B_TVOC10_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/sensor/voice/d124/d124.c b/APP_Framework/Framework/sensor/voice/d124/d124.c index e066edf91..c77d6bc6c 100644 --- a/APP_Framework/Framework/sensor/voice/d124/d124.c +++ b/APP_Framework/Framework/sensor/voice/d124/d124.c @@ -102,6 +102,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.serial_bit_order = 0; cfg.serial_invert_mode = 0; #ifdef SENSOR_D124_DRIVER_EXTUART + cfg.is_ext_uart = 1; cfg.ext_uart_no = SENSOR_DEVICE_D124_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/sensor/winddirection/qs-fx/qs-fx.c b/APP_Framework/Framework/sensor/winddirection/qs-fx/qs-fx.c index 24a6cb726..0a3987cc8 100644 --- a/APP_Framework/Framework/sensor/winddirection/qs-fx/qs-fx.c +++ b/APP_Framework/Framework/sensor/winddirection/qs-fx/qs-fx.c @@ -66,6 +66,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.serial_bit_order = 0; cfg.serial_invert_mode = 0; #ifdef SENSOR_QS_FX_DRIVER_EXTUART + cfg.is_ext_uart = 1; cfg.ext_uart_no = SENSOR_DEVICE_QS_FX_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/sensor/windspeed/qs-fs/qs-fs.c b/APP_Framework/Framework/sensor/windspeed/qs-fs/qs-fs.c index 427fa8273..2ff374381 100644 --- a/APP_Framework/Framework/sensor/windspeed/qs-fs/qs-fs.c +++ b/APP_Framework/Framework/sensor/windspeed/qs-fs/qs-fs.c @@ -64,7 +64,8 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.serial_parity_mode = PARITY_NONE; cfg.serial_bit_order = 0; cfg.serial_invert_mode = 0; -#ifdef SENSOR_QS_FS_DRIVER_EXTUART +#ifdef SENSOR_QS_FS_DRIVER_EXTUART + cfg.is_ext_uart = 1; cfg.ext_uart_no = SENSOR_DEVICE_QS_FS_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif diff --git a/APP_Framework/Framework/transform_layer/nuttx/transform.h b/APP_Framework/Framework/transform_layer/nuttx/transform.h index 71b4f48e7..98f83044f 100644 --- a/APP_Framework/Framework/transform_layer/nuttx/transform.h +++ b/APP_Framework/Framework/transform_layer/nuttx/transform.h @@ -142,7 +142,8 @@ struct SerialDataCfg uint8_t serial_invert_mode; uint16_t serial_buffer_size; - uint8 ext_uart_no; + uint8_t is_ext_uart; + uint8_t ext_uart_no; enum ExtSerialPortConfigure port_configure; }; diff --git a/APP_Framework/Framework/transform_layer/rtthread/transform.h b/APP_Framework/Framework/transform_layer/rtthread/transform.h index 3c1cce549..5eb7fecee 100644 --- a/APP_Framework/Framework/transform_layer/rtthread/transform.h +++ b/APP_Framework/Framework/transform_layer/rtthread/transform.h @@ -145,6 +145,7 @@ struct SerialDataCfg uint8_t serial_invert_mode; uint16_t serial_buffer_size; + uint8_t is_ext_uart; uint8_t ext_uart_no; enum ExtSerialPortConfigure port_configure; }; diff --git a/APP_Framework/Framework/transform_layer/xizi/transform.h b/APP_Framework/Framework/transform_layer/xizi/transform.h index 34c8f76ce..f6ec84fb3 100644 --- a/APP_Framework/Framework/transform_layer/xizi/transform.h +++ b/APP_Framework/Framework/transform_layer/xizi/transform.h @@ -133,6 +133,7 @@ struct SerialDataCfg uint16_t serial_buffer_size; int32 serial_timeout; + uint8_t is_ext_uart; uint8_t ext_uart_no; enum ExtSerialPortConfigure port_configure; };