Changeset 143 for rtos_arduino/trunk/arduino_lib/libraries/ESP8266/ESP8266.cpp

Timestamp:

Dec 5, 2015, 7:18:45 PM (8 years ago)

Author:

ertl-honda

Message:

Milkcocoa用に更新

File:

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

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

@@ -7 +7 @@
  * @par Copyright:
  * Copyright (c) 2015 ITEAD Intelligent Systems Co., Ltd. \n\n
+ * Copyright (C) 2015 Embedded and Real-Time Systems Laboratory
+ *              Graduate School of Information Science, Nagoya Univ., JAPAN \n\n
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -23 +25 @@
 #define LOG_OUTPUT_DEBUG            (1)
 #define LOG_OUTPUT_DEBUG_PREFIX     (1)
+
+#ifdef TOPPERS_WITH_ARDUINO
+#define WAIT_TIMEOUT delay(1);
+#else /* !TOPPERS_WITH_ARDUINO */
+#define WAIT_TIMEOUT
+#endif /* TOPPERS_WITH_ARDUINO */
 
 #define logDebug(arg)\
@@ -43 +51 @@
 
 #ifdef ESP8266_USE_SOFTWARE_SERIAL
-ESP8266::begin(SoftwareSerial &uart, uint32_t baud)
+void ESP8266::begin(SoftwareSerial &uart, uint32_t baud)
 {
     m_puart = &uart;
     m_baud = baud;
     m_puart->begin(baud);
-    rx_empty();            
+    rx_empty();
 }
 #else
@@ -56 +64 @@
     m_baud = baud;
     m_puart->begin(baud);
-    rx_empty();        
+    rx_empty();
 }
 #endif
@@ -306 +314 @@
 }
 
+int ESP8266::dataAvailable(void)
+{
+    return (m_puart->available() > 0)? 1 : 0;
+}
+            
 /*----------------------------------------------------------------------------*/
 /* +IPD,<id>,<len>:<data> */
@@ -334 +347 @@
             data += a;
         }else{
-            delay(1);
+            WAIT_TIMEOUT;
         }
         
@@ -366 +379 @@
     if (has_data) {
         i = 0;
-        ret = len > buffer_size ? buffer_size : len;
+        ret = (uint32_t)len > buffer_size ? buffer_size : len;
         start = millis();
         while (millis() - start < 3000) {
@@ -383 +396 @@
                 return ret;
             }
-            delay(1);
+            WAIT_TIMEOUT
         }
     }
@@ -410 +423 @@
             break;
         }
-        delay(1);
+        WAIT_TIMEOUT
     }
     return data;
@@ -416 +429 @@
 
 String ESP8266::recvString(String target1, String target2, uint32_t timeout)
-{
-    String data;
-    char a;
-    unsigned long start = millis();
-    while (millis() - start < timeout) {
-        while(m_puart->available() > 0) {
-            a = m_puart->read();
-                        if(a == '\0') continue;
-            data += a;
-        }
-        if (data.indexOf(target1) != -1) {
-            break;
-        } else if (data.indexOf(target2) != -1) {
-            break;
-        }
-        delay(1);
-    }
-    return data;
-}
-
-String ESP8266::recvString(String target1, String target2, String target3, uint32_t timeout)
 {
     String data;
@@ -451 +443 @@
         } else if (data.indexOf(target2) != -1) {
             break;
+        }
+        WAIT_TIMEOUT
+    }
+    return data;
+}
+
+String ESP8266::recvString(String target1, String target2, String target3, uint32_t timeout)
+{
+    String data;
+    char a;
+    unsigned long start = millis();
+    while (millis() - start < timeout) {
+        while(m_puart->available() > 0) {
+            a = m_puart->read();
+            if(a == '\0') continue;
+            data += a;
+        }
+        if (data.indexOf(target1) != -1) {
+            break;
+        } else if (data.indexOf(target2) != -1) {
+            break;
         } else if (data.indexOf(target3) != -1) {
             break;
         }
-        delay(1);
+        WAIT_TIMEOUT
     }
     return data;