Changeset 180 for rtos_arduino/trunk/arduino_lib/libraries/Milkcocoa_Arduino_SDK/Client_ESP8266.h

Timestamp:

Mar 28, 2016, 2:28:23 PM (8 years ago)

Author:

ertl-honda

Message:

ESP8266のライブラリの更新に伴う変更

File:

• rtos_arduino/trunk/arduino_lib/libraries/Milkcocoa_Arduino_SDK/Client_ESP8266.h (modified) (3 diffs)

rtos_arduino/trunk/arduino_lib/libraries/Milkcocoa_Arduino_SDK/Client_ESP8266.h

@@ -23 +23 @@
 #include "ESP8266.h"
 
-#define ESP8266CLIENT_BUFFER_LEN  512
-
 class ESP8266Client: public Client, public ESP8266 {
-
   public:
+    ESP8266Client(void) {
+        pbuffer = &rx_buffer[0];
+    }
+    
     /*
      * @retval 0 : faild
@@ -34 +35 @@
     int connect(IPAddress ip, uint16_t port) {
         String ip_str;
-        bufferlen= 0;
-        ip_str.concat(ip[0]);
-        ip_str.concat(".");
-        ip_str.concat(ip[1]);
-        ip_str.concat(".");
-        ip_str.concat(ip[2]);
-        ip_str.concat(".");
+        ip_str.concat(ip[0]); ip_str.concat(".");
+        ip_str.concat(ip[1]); ip_str.concat(".");
+        ip_str.concat(ip[2]); ip_str.concat(".");
         ip_str.concat(ip[3]);
-        _connected = (createTCP(ip_str, port))? 1 : 0;        
-        return (int)_connected;
+        return (createTCP(ip_str, port))? 1 : 0;
     };
     
     int connect(const char *host, uint16_t port) {
         String ip_str(host);
-        bufferlen= 0;
-        _connected = (createTCP(ip_str, port))? 1 : 0;        
-        return (int)_connected;        
+        return (createTCP(ip_str, port))? 1 : 0;
     };
     
@@ -56 +50 @@
         if(send(&data, 1)){
             return 1;
-        }
-        else {
-            return 0;
-        }
+        }        
+        return 0;
     };
+    
     size_t write(const uint8_t *buf, size_t size){
         if(send(buf, size)){
             return size;
         }
-        else {
-            return 0;
-        }
-    };
-    int available(){
-        if (bufferlen > 0) {
-            return 1;
-        }
-        if (dataAvailable()) {
-            bufferlen = recv(buffer, ESP8266CLIENT_BUFFER_LEN);
-            pbuffer = buffer;
-            //In case of that data is available but it is not valid data(not +IPD,...),
-            //connection is closed by server.(send "CLOSED")
-            if(bufferlen == 0){
-                _connected = 0;
-                releaseTCP();
-                return 0;
-            }
-            return 1;
-        }
         return 0;
     };
+    
+    int available(){
+        return isDataAvailable();
+    };
+    
     int read(){
-        if (bufferlen == 0) {
-            bufferlen = recv(buffer, ESP8266CLIENT_BUFFER_LEN);
-            pbuffer = buffer;
+        uint8_t data;
+        if(recv(&data, 1) == 1) {
+            return data;
         }
-        if (bufferlen > 0){
-            bufferlen--;
-            return *pbuffer++;
-        }
-        else {
-            return (int)-1;
-        }            
+        return (int)-1;
     };
-    int read(uint8_t *buf, size_t size){return recv(buf, size);};
-    int peek(){return 1;};
+    
+    int read(uint8_t *buf, size_t size){
+        return recv(buf, size);
+    };
+    
+    int peek(){
+        return pbuffer->peek();
+    };
+    
     void flush(){};
     void stop(){releaseTCP();};
-    uint8_t connected(){return _connected;};
-    operator bool(){return (bool)(_connected == 1);};
+    uint8_t connected(){return (isConnected())? 1 : 0;};
+    operator bool(){return isConnected();};
   private:
-    uint8_t _connected;
-    uint8_t buffer[ESP8266CLIENT_BUFFER_LEN];
-    uint8_t bufferlen;
-    uint8_t *pbuffer;
+    ESP8266_RingBuffer *pbuffer;
 };