Merge pull request 'merge code' (#15) from develop into prepare_for_master

2023-05-23 19:13:30 +08:00
parent c40518d226 b545031e5e
commit 6601e228f2
2 changed files with 1265 additions and 27 deletions
--- a/APP_Framework/Framework/connection/4g/ec200t/ec200t.c
+++ b/APP_Framework/Framework/connection/4g/ec200t/ec200t.c
@@ -163,6 +163,8 @@ static int Ec200tIoctl(struct Adapter *adapter, int cmd, void *args)
    serial_cfg.serial_parity_mode = PARITY_NONE;
    serial_cfg.serial_bit_order = STOP_BITS_1;
    serial_cfg.serial_invert_mode = NRZ_NORMAL;
+    //serial receive timeout 10s
+    serial_cfg.serial_timeout = 10000;
    serial_cfg.is_ext_uart = 0;
 #ifdef ADAPTER_EC200T_DRIVER_EXT_PORT
    serial_cfg.is_ext_uart = 1;
--- a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/common/pin_mux.c
+++ b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/common/pin_mux.c