Changeset 199

Timestamp:

Mar 31, 2016, 12:10:31 AM (8 years ago)

Author:

ertl-honda

Message:

不具合修正

File:

• rtos_arduino/trunk/arduino_lib/libraries/ESP8266_Arudino_AT/ESP8266.cpp (modified) (3 diffs)

rtos_arduino/trunk/arduino_lib/libraries/ESP8266_Arudino_AT/ESP8266.cpp

@@ -790 +790 @@
             rx_cmd += a;
             if (rx_cmd.indexOf("+IPD,") != -1) {
-                if((ret = recvIPD(timeout - (millis() - start), buffer, buffer_size,
-                                  mux_id, coming_mux_id)) != 0) {
-                    rx_cmd = "";
-                    return ret;
-                }
+                ret = recvIPD(timeout - (millis() - start), buffer, buffer_size,
+                              mux_id, coming_mux_id);
+                rx_cmd = "";
+                return ret;
             } else {
                 recvAsyncdata();
@@ -871 +870 @@
                 }
                 if (i == (uint32_t)len) {
-                    return len;
+                    /* id != mux_id */
+                    return 0;
                 }
-                WAIT_TIMEOUT
+                WAIT_TIMEOUT;
             }
-            return i;
+            return 0;
         }
         else {
@@ -920 +920 @@
 
     if (rx_cmd.indexOf("+IPD,") != -1) {
-        if(recvIPD(timeout) != 0) {
-            rx_cmd = "";
-        }
+        recvIPD(timeout);
+        rx_cmd = "";
     } else if (rx_cmd.indexOf("CLOSED") != -1) {
         if ((index = rx_cmd.indexOf(",CLOSED")) != -1) {