Changeset 180

Timestamp:

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

Author:

ertl-honda

Message:

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

Location:

rtos_arduino/trunk/arduino_lib/libraries/Milkcocoa_Arduino_SDK

Files:

• Adafruit_MQTT.cpp (modified) (2 diffs)
• Client_ESP8266.h (modified) (3 diffs)
• Milkcocoa.cpp (modified) (4 diffs)
• Milkcocoa.h (modified) (3 diffs)
• include/Adafruit/Adafruit_MQTT_CC3000.h (deleted)
• include/Adafruit/Adafruit_MQTT_FONA.h (deleted)

rtos_arduino/trunk/arduino_lib/libraries/Milkcocoa_Arduino_SDK/Adafruit_MQTT.cpp

@@ -35 +35 @@
     else
       DEBUG_PRINTER.print(" ");
+#if 0      
     DEBUG_PRINTER.print(F(" [0x"));
     if (buffer[i] < 0x10)
@@ -41 +42 @@
     DEBUG_PRINTER.print("], ");
     if (i % 8 == 7) DEBUG_PRINTER.println();
+#endif            
   }
   DEBUG_PRINTER.println();

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;
 };
 

rtos_arduino/trunk/arduino_lib/libraries/Milkcocoa_Arduino_SDK/Milkcocoa.cpp

@@ -35 +35 @@
 DataElement::DataElement(char *json_string) {
   paJsonObj = aJson.parse(json_string);
-  params = aJson.getObjectItem(paJsonObj, "params");    
+  params = aJson.getObjectItem(paJsonObj, "params");
 }
 
@@ -56 +56 @@
 }
 
-char *DataElement::getString(const char *key) {
+bool DataElement::getString(const char *key, char **pdata) {
   aJsonObject* obj = aJson.getObjectItem(params, key);
-  return obj->valuestring;
-}
-
-int DataElement::getInt(const char *key) {
+  if((obj == NULL) || (obj->type != aJson_String)) {return false;}
+  *pdata = obj->valuestring;    
+  return true;
+}
+
+bool DataElement::getInt(const char *key, int *pdata) {
+  aJsonObject* obj = aJson.getObjectItem(params, key);    
+  if((obj == NULL) || (obj->type != aJson_Int)) {return false;}
+  *pdata = obj->valueint;
+  return true;
+}
+
+bool DataElement::getFloat(const char *key, float *pdata) {
   aJsonObject* obj = aJson.getObjectItem(params, key);
-  if(obj == NULL)
-    Serial.println("obj is NULL");
-  return obj->valueint;
-}
-
-float DataElement::getFloat(const char *key) {
-  aJsonObject* obj = aJson.getObjectItem(params, key);
-  return obj->valuefloat;
-}
-
+  if((obj == NULL) || (obj->type != aJson_Float)) {return false;}
+  *pdata = obj->valuefloat;
+  return true;
+}
 
 char *DataElement::toCharArray() {
@@ -106 +109 @@
 }
 
-void Milkcocoa::connect() {
-  int ret;
+/*
+ *  tmout
+ *   1-   : Connect try time.
+ *   0    : retry Forever
+ *  Return code
+ *   0     : Success
+ *   other : Error code (see Adafruit_MQTT::connectErrorString()) 
+ */
+int8_t Milkcocoa::connect(int32_t tmout) {
+  int8_t ret;
+  int32_t retry = 0;
 
   if (mqtt->connected()) {
-    return;
-  }
-
-  Serial.print("Connecting to MQTT... ");
+    return 0;
+  }
+
+  MILKCOCOA_DEBUG_PRINTLN("Connecting to MQTT... ");
 
   while ((ret = mqtt->connect()) != 0) { // connect will return 0 for connected
-       Serial.println(mqtt->connectErrorString(ret));
-       Serial.println(ret);
-       Serial.println("Retrying MQTT connection in 5 seconds...");
-       mqtt->disconnect();
-       delay(5000);  // wait 5 seconds
-  }
-  Serial.println("MQTT Connected!");
-}
-
-bool Milkcocoa::push(const char *path, DataElement *pdataelement) {
+      mqtt->disconnect();
+      // Timeout
+      if ((tmout !=  0) && (++retry == tmout)) {
+          return ret;
+      }
+      delay(MILKCOCOA_CONNECT_DELAY_MS);
+  }
+  MILKCOCOA_DEBUG_PRINTLN("MQTT Connected!");
+
+  return 0;  
+}
+
+int8_t Milkcocoa::push(const char *path, DataElement *pdataelement, uint16_t timeout) {
   char topic[100];
-  bool ret;
+  int8_t ret;
   char *send_array;
+
+  if((ret = connect(timeout)) != 0){return ret;}
+    
   sprintf(topic, "%s/%s/push", app_id, path);
   Adafruit_MQTT_Publish pushPublisher = Adafruit_MQTT_Publish(mqtt, topic);
   send_array = pdataelement->toCharArray();
-  ret = pushPublisher.publish(send_array);
+  ret = (pushPublisher.publish(send_array))? 0 : MILKCOCOA_PUSH_ERRORNO;
   free(send_array);
   return ret;
 }
 
-bool Milkcocoa::send(const char *path, DataElement *pdataelement) {
+int8_t Milkcocoa::send(const char *path, DataElement *pdataelement, uint16_t timeout) {
   char topic[100];
-  bool ret;
-  char *send_array;    
+  int8_t ret;
+  char *send_array;
+
+  if((ret = connect(timeout)) != 0){return ret;}
+    
   sprintf(topic, "%s/%s/send", app_id, path);
   Adafruit_MQTT_Publish pushPublisher = Adafruit_MQTT_Publish(mqtt, topic);
   send_array = pdataelement->toCharArray();
-  ret = pushPublisher.publish(send_array);
+  ret = (pushPublisher.publish(send_array))? 0 : MILKCOCOA_PUSH_ERRORNO;
   free(send_array);    
   return ret;
 }
 
-void Milkcocoa::loop() {
-  connect();
+/*
+ *  Return code
+ *   0     : Success
+ *   other : Error code
+ *           -1,1-6 : see Adafruit_MQTT::connectErrorString()
+ */
+int8_t Milkcocoa::loop(uint16_t timeout) {
+  int8_t ret;
+
+  if((ret = connect(timeout)) != 0){return ret;}
+   
   Adafruit_MQTT_Subscribe *subscription;
   while ((subscription = mqtt->readSubscription(1000))) {
@@ -161 +191 @@
     }
   }
+
+  return 0;  
 }
 

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

@@ -32 +32 @@
 
 #define MILKCOCOA_SUBSCRIBERS 8
+#define MILKCOCOA_CONNECT_DELAY_MS 5000
+
+#define MILKCOCOA_PUSH_ERRORNO -2
+#define MILKCOCOA_SEND_ERRORNO -2
+
+//#define MILKCOCOA_DEBUG
+
+#define DEBUG_PRINTER Serial
+
+#ifdef MILKCOCOA_DEBUG
+  #define MILKCOCOA_DEBUG_PRINT(...) { DEBUG_PRINTER.print(__VA_ARGS__); }
+  #define MILKCOCOA_DEBUG_PRINTLN(...) { DEBUG_PRINTER.println(__VA_ARGS__); }
+  #define MILKCOCOA_DEBUG_PRINTBUFFER(buffer, len) { printBuffer(buffer, len); }
+#else
+  #define MILKCOCOA_DEBUG_PRINT(...) {}
+  #define MILKCOCOA_DEBUG_PRINTLN(...) {}
+  #define MILKCOCOA_DEBUG_PRINTBUFFER(buffer, len) {}
+#endif
 
 class DataElement {
@@ -42 +60 @@
     void setValue(const char *key, double v);
     char *toCharArray();
-    char *getString(const char *key);
-    int getInt(const char *key);
-    float getFloat(const char *key);
+    bool getString(const char *key, char **pdata);
+    bool getInt(const char *key, int *pdata);
+    bool getFloat(const char *key, float *pdata);
     
   private:
@@ -67 +85 @@
   Milkcocoa(Client *client, const char *host, uint16_t port, const char *_app_id, const char *client_id, const char *_session);
   static Milkcocoa* createWithApiKey(Client *client, const char *host, uint16_t port, const char *app_id, const char *client_id, const char *key, const char *secret);
-  void connect();
-  void loop();
-  bool push(const char *path, DataElement *pdataelement);
-  bool send(const char *path, DataElement *pdataelement);
+  int8_t connect(int32_t tmout = 0);
+  int8_t loop(uint16_t timeout = 0);
+  int8_t push(const char *path, DataElement *pdataelement, uint16_t timeout = 0);
+  int8_t send(const char *path, DataElement *pdataelement, uint16_t timeout = 0);
   bool on(const char *path, const char *event, GeneralFunction cb);
-
+  const __FlashStringHelper* connectErrorString(int8_t code) {return mqtt->connectErrorString(code);};
+  const __FlashStringHelper* pushErrorString(int8_t code) {if(code == MILKCOCOA_PUSH_ERRORNO) return F("Push error"); return mqtt->connectErrorString(code);};
 
 private: