Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into connection

2023-11-28 16:55:16 +08:00
parent 3378579d9e c4aaf920cd
commit a7d3e92357
2113 changed files with 305243 additions and 677 deletions
@@ -167,7 +167,7 @@ static int Ec200tIoctl(struct Adapter *adapter, int cmd, void *args)
    serial_cfg.serial_timeout = OTA_RX_TIMEOUT;
 #else
    //serial receive timeout 10s
-    serial_cfg.serial_timeout = 100000;
+    serial_cfg.serial_timeout = 10000;
 #endif
    serial_cfg.is_ext_uart = 0;
 #ifdef ADAPTER_EC200T_DRIVER_EXT_PORT
@@ -355,7 +355,7 @@ static int GetCompleteATReply(ATAgentType agent)
        PrivMutexObtain(&agent->lock);
        if (agent->receive_mode == ENTM_MODE) {
            if (agent->entm_recv_len < ENTM_RECV_MAX) {
-#ifdef TOOL_USING_MQTT
+#ifdef LIB_USING_MQTT
                if((res == 1) && (agent->entm_recv_len < agent->read_len)) 
                {
                    agent->entm_recv_buf[agent->entm_recv_len] = ch;
@@ -29,7 +29,7 @@
 #define REPLY_TIME_OUT 10

 #ifdef TOOL_USING_OTA
-#define ENTM_RECV_MAX OTA_RX_BUFFERSIZE
+#define ENTM_RECV_MAX (OTA_FRAME_SIZE + 1024)
 #else
 #define ENTM_RECV_MAX 256
 #endif