Merge pull request #62 from blinker-iot/dev

update version & fix MQTT pub bug
blinker-iot · Jun 20, 2018 · 3f2ab83 · 3f2ab83
2 parents 5fad205 + bfa30e3
commit 3f2ab83
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/library.json b/library.json
@@ -13,7 +13,7 @@
         "type": "git",
         "url": "https://github.com/blinker-iot/blinker-library.git"
     },
-    "version": "0.1.3",
+    "version": "0.1.4",
     "homepage": "https://blinker.app/",
     "export": {
         "exclude": [

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Blinker
-version=0.1.3
+version=0.1.4
 author=i3water
 maintainer=i3wawter
 sentence=Build a easy way for your project to communicate with smartphone, work with smartphone app Blinker.

diff --git a/src/Adapters/BlinkerMQTT.h b/src/Adapters/BlinkerMQTT.h
@@ -671,11 +671,11 @@ void BlinkerMQTT::subscribe() {
 
 void BlinkerMQTT::print(String data) {
     if (*isHandle) {
-        bool state = STRING_contais_string(s_data, BLINKER_CMD_NOTICE);
+        bool state = STRING_contais_string(data, BLINKER_CMD_NOTICE);
 
         if (!state) {
-            state = (STRING_contais_string(s_data, BLINKER_CMD_STATE) 
-                && STRING_contais_string(s_data, BLINKER_CMD_CONNECTED));
+            state = (STRING_contais_string(data, BLINKER_CMD_STATE) 
+                && STRING_contais_string(data, BLINKER_CMD_CONNECTED));
         }
 
         if (!state) {

diff --git a/src/Blinker.h b/src/Blinker.h
@@ -29,6 +29,16 @@
         #error This code is intended to run on the ESP8266/ESP32 platform! Please check your Tools->Board setting.
     #endif
 
+#elif defined(BLINKER_PRO)
+
+    #if defined(ESP8266)
+        #include <BlinkerSimpleESP8266_PRO.h>
+    #elif defined(ESP32)
+        #include <BlinkerSimpleESP32_PRO.h>
+    #else
+        #error This code is intended to run on the ESP8266/ESP32 platform! Please check your Tools->Board setting.
+    #endif
+
 #endif
 
 #endif
diff --git a/src/Blinker/BlinkerConfig.h b/src/Blinker/BlinkerConfig.h
@@ -1,7 +1,7 @@
 #ifndef BlinkerConfig_H
 #define BlinkerConfig_H
 
-#define BLINKER_VERSION                 "0.1.3"
+#define BLINKER_VERSION                 "0.1.4"
 
 #define BLINKER_CONNECT_TIMEOUT_MS      10000UL