Changeset 180 for rtos_arduino/trunk/arduino_lib/libraries/Milkcocoa_Arduino_SDK/Milkcocoa.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/Milkcocoa.h (modified) (3 diffs)

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: