Revision 2:1538810a5d87, committed 2016-06-16

Comitter:

lixianyu

Date:

Thu Jun 16 08:06:28 2016 +0000

Parent:

1:401940b68eae

Commit message:

?9600?????ESP8266????????115200??ESP8266???????9600?????????????????Timer?????

Changed in this revision

diff -r 401940b68eae -r 1538810a5d87 Blynk/BlynkConfig.h
--- a/Blynk/BlynkConfig.h	Sat May 07 08:09:44 2016 +0000
+++ b/Blynk/BlynkConfig.h	Thu Jun 16 08:06:28 2016 +0000
@@ -34,7 +34,7 @@
 
 // Network timeout in milliseconds.
 #ifndef BLYNK_TIMEOUT_MS
-#define BLYNK_TIMEOUT_MS     2000UL
+#define BLYNK_TIMEOUT_MS     5000UL
 #endif
 
 // Limit the amount of outgoing commands.

diff -r 401940b68eae -r 1538810a5d87 Blynk/BlynkDebug.h
--- a/Blynk/BlynkDebug.h	Sat May 07 08:09:44 2016 +0000
+++ b/Blynk/BlynkDebug.h	Thu Jun 16 08:06:28 2016 +0000
@@ -14,35 +14,35 @@
 #include <Blynk/BlynkConfig.h>
 #include <stddef.h>
 #ifdef ESP8266
-    extern "C" {
-    #include "ets_sys.h"
-    #include "os_type.h"
-    #include "mem.h"
-    }
+extern "C" {
+#include "ets_sys.h"
+#include "os_type.h"
+#include "mem.h"
+}
 #else
-    #include <inttypes.h>
+#include <inttypes.h>
 #endif
 
 #if defined(ARDUINO_ARCH_ARC32)
-    typedef uint64_t millis_time_t;
+typedef uint64_t millis_time_t;
 #else
-    typedef uint32_t millis_time_t;
+typedef uint32_t millis_time_t;
 #endif
 
 #if defined(SPARK) || defined(PARTICLE)
-    #include "application.h"
+#include "application.h"
 #endif
 
 #if defined(ARDUINO)
-    #if ARDUINO >= 100
-        #include "Arduino.h"
-    #else
-        #include "WProgram.h"
-    #endif
+#if ARDUINO >= 100
+#include "Arduino.h"
+#else
+#include "WProgram.h"
+#endif
 #endif
 
 #if !defined(ARDUINO) || (ARDUINO < 151)
-    #define BLYNK_NO_YIELD
+#define BLYNK_NO_YIELD
 #endif
 
 // General defines
@@ -57,15 +57,15 @@
 #define BLYNK_FORCE_INLINE inline //__attribute__((always_inline))
 
 #if defined(__AVR__)
-    #include <avr/pgmspace.h>
-    #define BLYNK_HAS_PROGMEM
-    #define BLYNK_PROGMEM PROGMEM
-    #define BLYNK_F(s) F(s)
-    #define BLYNK_PSTR(s) PSTR(s)
+#include <avr/pgmspace.h>
+#define BLYNK_HAS_PROGMEM
+#define BLYNK_PROGMEM PROGMEM
+#define BLYNK_F(s) F(s)
+#define BLYNK_PSTR(s) PSTR(s)
 #else
-    #define BLYNK_PROGMEM
-    #define BLYNK_F(s) s
-    #define BLYNK_PSTR(s) s
+#define BLYNK_PROGMEM
+#define BLYNK_F(s) s
+#define BLYNK_PSTR(s) s
 #endif
 
 #ifndef LED_BUILTIN
@@ -89,164 +89,172 @@
 
 #ifdef BLYNK_PRINT
 
-    #if defined(ARDUINO) || defined(SPARK) || defined(PARTICLE)
+#if defined(ARDUINO) || defined(SPARK) || defined(PARTICLE)
 
 #if defined(ARDUINO_ARCH_ARC32)
-        // This will cause error - on purpose
-        #define BLYNK_LOG(msg, ...)  BLYNK_LOG_UNAVAILABLE(msg, ##__VA_ARGS__)
+// This will cause error - on purpose
+#define BLYNK_LOG(msg, ...)  BLYNK_LOG_UNAVAILABLE(msg, ##__VA_ARGS__)
 #else
-        #define BLYNK_LOG(msg, ...)  blynk_dbg_print(BLYNK_PSTR(msg), ##__VA_ARGS__)
+#define BLYNK_LOG(msg, ...)  blynk_dbg_print(BLYNK_PSTR(msg), ##__VA_ARGS__)
 #endif
 
-        #define BLYNK_LOG1(p1)            { BLYNK_LOG_TIME(); BLYNK_PRINT.println(p1); }
-        #define BLYNK_LOG2(p1,p2)         { BLYNK_LOG_TIME(); BLYNK_PRINT.print(p1); BLYNK_PRINT.println(p2); }
-        #define BLYNK_LOG3(p1,p2,p3)      { BLYNK_LOG_TIME(); BLYNK_PRINT.print(p1); BLYNK_PRINT.print(p2); BLYNK_PRINT.println(p3); }
-        #define BLYNK_LOG4(p1,p2,p3,p4)   { BLYNK_LOG_TIME(); BLYNK_PRINT.print(p1); BLYNK_PRINT.print(p2); BLYNK_PRINT.print(p3); BLYNK_PRINT.println(p4); }
-        #define BLYNK_LOG6(p1,p2,p3,p4,p5,p6) { BLYNK_LOG_TIME(); BLYNK_PRINT.print(p1); BLYNK_PRINT.print(p2); BLYNK_PRINT.print(p3); BLYNK_PRINT.print(p4); BLYNK_PRINT.print(p5); BLYNK_PRINT.println(p6); }
-        #define BLYNK_LOG_IP(msg, ip)     { BLYNK_LOG_TIME(); BLYNK_PRINT.print(BLYNK_F(msg)); \
+#define BLYNK_LOG1(p1)            { BLYNK_LOG_TIME(); BLYNK_PRINT.println(p1); }
+#define BLYNK_LOG2(p1,p2)         { BLYNK_LOG_TIME(); BLYNK_PRINT.print(p1); BLYNK_PRINT.println(p2); }
+#define BLYNK_LOG3(p1,p2,p3)      { BLYNK_LOG_TIME(); BLYNK_PRINT.print(p1); BLYNK_PRINT.print(p2); BLYNK_PRINT.println(p3); }
+#define BLYNK_LOG4(p1,p2,p3,p4)   { BLYNK_LOG_TIME(); BLYNK_PRINT.print(p1); BLYNK_PRINT.print(p2); BLYNK_PRINT.print(p3); BLYNK_PRINT.println(p4); }
+#define BLYNK_LOG6(p1,p2,p3,p4,p5,p6) { BLYNK_LOG_TIME(); BLYNK_PRINT.print(p1); BLYNK_PRINT.print(p2); BLYNK_PRINT.print(p3); BLYNK_PRINT.print(p4); BLYNK_PRINT.print(p5); BLYNK_PRINT.println(p6); }
+#define BLYNK_LOG_IP(msg, ip)     { BLYNK_LOG_TIME(); BLYNK_PRINT.print(BLYNK_F(msg)); \
                                             BLYNK_PRINT.print(ip[0]); BLYNK_PRINT.print('.');  \
                                             BLYNK_PRINT.print(ip[1]); BLYNK_PRINT.print('.');  \
                                             BLYNK_PRINT.print(ip[2]); BLYNK_PRINT.print('.');  \
                                             BLYNK_PRINT.println(ip[3]); }
-        #define BLYNK_LOG_IP_REV(msg, ip) { BLYNK_LOG_TIME(); BLYNK_PRINT.print(BLYNK_F(msg)); \
+#define BLYNK_LOG_IP_REV(msg, ip) { BLYNK_LOG_TIME(); BLYNK_PRINT.print(BLYNK_F(msg)); \
                                             BLYNK_PRINT.print(ip[3]); BLYNK_PRINT.print('.');  \
                                             BLYNK_PRINT.print(ip[2]); BLYNK_PRINT.print('.');  \
                                             BLYNK_PRINT.print(ip[1]); BLYNK_PRINT.print('.');  \
                                             BLYNK_PRINT.println(ip[0]); }
 
-        static
-        void BLYNK_LOG_TIME() {
-            BLYNK_PRINT.print('[');
-            BLYNK_PRINT.print(millis());
-            BLYNK_PRINT.print(BLYNK_F("] "));
-        }
+static
+void BLYNK_LOG_TIME()
+{
+    BLYNK_PRINT.print('[');
+    BLYNK_PRINT.print(millis());
+    BLYNK_PRINT.print(BLYNK_F("] "));
+}
 
 #ifdef BLYNK_DEBUG
-        #include <ctype.h>
-        #define BLYNK_DBG_BREAK()    { for(;;); }
-        #define BLYNK_ASSERT(expr)   { if(!(expr)) { BLYNK_LOG2(BLYNK_F("Assertion failed: "), BLYNK_F(#expr)); BLYNK_DBG_BREAK() } }
+#include <ctype.h>
+#define BLYNK_DBG_BREAK()    { for(;;); }
+#define BLYNK_ASSERT(expr)   { if(!(expr)) { BLYNK_LOG2(BLYNK_F("Assertion failed: "), BLYNK_F(#expr)); BLYNK_DBG_BREAK() } }
 
-        static
-        void BLYNK_DBG_DUMP(const char* msg, const void* addr, size_t len) {
-            if (len) {
-                BLYNK_LOG_TIME();
-                BLYNK_PRINT.print(msg);
-                int l2 = len;
-                const uint8_t* octets = (const uint8_t*)addr;
-                bool prev_print = true;
-                while (l2--) {
-                    const uint8_t c = *octets++ & 0xFF;
-                    if (isprint(c)) {
-                        if (!prev_print) { BLYNK_PRINT.print(']'); }
-                        BLYNK_PRINT.print((char)c);
-                        prev_print = true;
-                    } else {
-                        BLYNK_PRINT.print(prev_print?'[':'|');
-                        if (c < 0x10) { BLYNK_PRINT.print('0'); }
-                        BLYNK_PRINT.print(c, HEX);
-                        prev_print = false;
-                    }
+static
+void BLYNK_DBG_DUMP(const char* msg, const void* addr, size_t len)
+{
+    if (len) {
+        BLYNK_LOG_TIME();
+        BLYNK_PRINT.print(msg);
+        int l2 = len;
+        const uint8_t* octets = (const uint8_t*)addr;
+        bool prev_print = true;
+        while (l2--) {
+            const uint8_t c = *octets++ & 0xFF;
+            if (isprint(c)) {
+                if (!prev_print) {
+                    BLYNK_PRINT.print(']');
                 }
-                BLYNK_PRINT.println(prev_print?"":"]");
+                BLYNK_PRINT.print((char)c);
+                prev_print = true;
+            } else {
+                BLYNK_PRINT.print(prev_print?'[':'|');
+                if (c < 0x10) {
+                    BLYNK_PRINT.print('0');
+                }
+                BLYNK_PRINT.print(c, HEX);
+                prev_print = false;
             }
         }
+        BLYNK_PRINT.println(prev_print?"":"]");
+    }
+}
 #endif
 
-        #if !defined(ARDUINO_ARCH_ARC32)
-        #include <stdio.h>
-        #include <stdarg.h>
-
-        static
-        void blynk_dbg_print(const char* BLYNK_PROGMEM fmt, ...)
-        {
-            va_list ap;
-            va_start(ap, fmt);
-            char buff[128];
-            BLYNK_PRINT.print('[');
-            BLYNK_PRINT.print(millis());
-            BLYNK_PRINT.print(F("] "));
+#if !defined(ARDUINO_ARCH_ARC32)
+#include <stdio.h>
+#include <stdarg.h>
+static
+void blynk_dbg_print(const char* BLYNK_PROGMEM fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    char buff[128];
+    BLYNK_PRINT.print('[');
+    BLYNK_PRINT.print(millis());
+    BLYNK_PRINT.print(F("] "));
 #if defined(__AVR__)
-            vsnprintf_P(buff, sizeof(buff), fmt, ap);
+    vsnprintf_P(buff, sizeof(buff), fmt, ap);
 #else
-            vsnprintf(buff, sizeof(buff), fmt, ap);
+    vsnprintf(buff, sizeof(buff), fmt, ap);
 #endif
-            BLYNK_PRINT.println(buff);
-            va_end(ap);
-        }
-        #endif // ARDUINO_ARCH_ARC32
-    /*#elif defined(MBED_LIBRARY_VERSION)
-        void delay(unsigned long ms);
-        unsigned long millis(void);
-    */
-    #elif defined(LINUX)
+    BLYNK_PRINT.println(buff);
+    va_end(ap);
+}
+#endif // ARDUINO_ARCH_ARC32
+/*#elif defined(MBED_LIBRARY_VERSION)
+    void delay(unsigned long ms);
+    unsigned long millis(void);
+*/
+#elif defined(LINUX)
 
-        #include <assert.h>
-        #include <stdio.h>
-        #include <string.h>
-        #include <errno.h>
-        #include <signal.h>
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <signal.h>
 
-        #include <iostream>
-        using namespace std;
-        #define BLYNK_LOG(msg, ...)       { fprintf(BLYNK_PRINT, "[%ld] " msg "\n", millis(), ##__VA_ARGS__); }
-        #define BLYNK_LOG1(p1)            { BLYNK_LOG_TIME(); cout << p1 << endl; }
-        #define BLYNK_LOG2(p1,p2)         { BLYNK_LOG_TIME(); cout << p1 << p2 << endl; }
-        #define BLYNK_LOG3(p1,p2,p3)      { BLYNK_LOG_TIME(); cout << p1 << p2 << p3 << endl; }
-        #define BLYNK_LOG4(p1,p2,p3,p4)   { BLYNK_LOG_TIME(); cout << p1 << p2 << p3 << p4 << endl; }
-        #define BLYNK_LOG6(p1,p2,p3,p4,p5,p6)   { BLYNK_LOG_TIME(); cout << p1 << p2 << p3 << p4 << p5 << p6 << endl; }
+#include <iostream>
+using namespace std;
+#define BLYNK_LOG(msg, ...)       { fprintf(BLYNK_PRINT, "[%ld] " msg "\n", millis(), ##__VA_ARGS__); }
+#define BLYNK_LOG1(p1)            { BLYNK_LOG_TIME(); cout << p1 << endl; }
+#define BLYNK_LOG2(p1,p2)         { BLYNK_LOG_TIME(); cout << p1 << p2 << endl; }
+#define BLYNK_LOG3(p1,p2,p3)      { BLYNK_LOG_TIME(); cout << p1 << p2 << p3 << endl; }
+#define BLYNK_LOG4(p1,p2,p3,p4)   { BLYNK_LOG_TIME(); cout << p1 << p2 << p3 << p4 << endl; }
+#define BLYNK_LOG6(p1,p2,p3,p4,p5,p6)   { BLYNK_LOG_TIME(); cout << p1 << p2 << p3 << p4 << p5 << p6 << endl; }
 
-        #define BLYNK_LOG_TIME() cout << '[' << millis() << "] ";
+#define BLYNK_LOG_TIME() cout << '[' << millis() << "] ";
 
 #ifdef BLYNK_DEBUG
-        #define BLYNK_DBG_BREAK()    raise(SIGTRAP);
-        #define BLYNK_ASSERT(expr)   assert(expr)
+#define BLYNK_DBG_BREAK()    raise(SIGTRAP);
+#define BLYNK_ASSERT(expr)   assert(expr)
 
-        static
-        void BLYNK_DBG_DUMP(const char* msg, const void* addr, size_t len) {
-            BLYNK_LOG_TIME();
-            fprintf(BLYNK_PRINT, msg);
-            int l2 = len;
-            const uint8_t* octets = (const uint8_t*)addr;
-            bool prev_print = true;
-            while (l2--) {
-                const uint8_t c = *octets++ & 0xFF;
-                if (c > 31) {
-                    if (!prev_print) { fputc(']', BLYNK_PRINT); }
-                    fputc((char)c, BLYNK_PRINT);
-                    prev_print = true;
-                } else {
-                    fputc(prev_print?'[':'|', BLYNK_PRINT);
-                    fprintf(BLYNK_PRINT, "%02x", c);
-                    prev_print = false;
-                }
+static
+void BLYNK_DBG_DUMP(const char* msg, const void* addr, size_t len)
+{
+    BLYNK_LOG_TIME();
+    fprintf(BLYNK_PRINT, msg);
+    int l2 = len;
+    const uint8_t* octets = (const uint8_t*)addr;
+    bool prev_print = true;
+    while (l2--) {
+        const uint8_t c = *octets++ & 0xFF;
+        if (c > 31) {
+            if (!prev_print) {
+                fputc(']', BLYNK_PRINT);
             }
-            fprintf(BLYNK_PRINT, "%s\n", prev_print?"":"]");
+            fputc((char)c, BLYNK_PRINT);
+            prev_print = true;
+        } else {
+            fputc(prev_print?'[':'|', BLYNK_PRINT);
+            fprintf(BLYNK_PRINT, "%02x", c);
+            prev_print = false;
         }
+    }
+    fprintf(BLYNK_PRINT, "%s\n", prev_print?"":"]");
+}
 #endif
 
-    #else
+#else
 
-        #warning Could not detect platform
+#warning Could not detect platform
 
-    #endif
+#endif
 
 #endif
 
 #ifndef BLYNK_LOG
-    #define BLYNK_LOG(...)
-    #define BLYNK_LOG1(p1)
-    #define BLYNK_LOG2(p1,p2)
-    #define BLYNK_LOG3(p1,p2,p3)
-    #define BLYNK_LOG4(p1,p2,p3,p4)
-    #define BLYNK_LOG6(p1,p2,p3,p4,p5,p6)
-    #define BLYNK_LOG_IP(msg, ip)
-    #define BLYNK_LOG_IP_REV(msg, ip)
+#define BLYNK_LOG(...)
+#define BLYNK_LOG1(p1)
+#define BLYNK_LOG2(p1,p2)
+#define BLYNK_LOG3(p1,p2,p3)
+#define BLYNK_LOG4(p1,p2,p3,p4)
+#define BLYNK_LOG6(p1,p2,p3,p4,p5,p6)
+#define BLYNK_LOG_IP(msg, ip)
+#define BLYNK_LOG_IP_REV(msg, ip)
 #endif
 
 #ifndef BLYNK_DBG_BREAK
-    #define BLYNK_DBG_BREAK()
-    #define BLYNK_ASSERT(expr)
-    #define BLYNK_DBG_DUMP(msg, addr, len)
+#define BLYNK_DBG_BREAK()
+#define BLYNK_ASSERT(expr)
+#define BLYNK_DBG_DUMP(msg, addr, len)
 #endif
 
 #endif