Merge pull request #580 from blinker-iot/dev_3.0

update codes, upgrade BLINKER AUTO INIT codes.

Author: i3water

library.json

@@ -13,7 +13,7 @@
         "type": "git",
         "url": "https://github.com/blinker-iot/blinker-library.git"
     },
-    "version": "0.3.80210609",
+    "version": "0.3.80210611",
     "homepage": "https://diandeng.tech/home",
     "export": {
         "exclude": [

library.properties

@@ -1,5 +1,5 @@
 name=Blinker
-version=0.3.80210609
+version=0.3.80210611
 author=i3water
 maintainer=i3wawter
 sentence=Build a easy way for your IoT project.

src/Adapters/BlinkerMQTT.h

@@ -2650,7 +2650,7 @@ int BlinkerMQTT::checkPrintLimit()
 {
     if ((millis() - _print_time) < 60000)
     {
-        if (_print_times < 10) return true;
+        if (_print_times < 30) return true;
         else 
         {
             BLINKER_ERR_LOG(BLINKER_F("MQTT MSG LIMIT"));
@@ -3004,16 +3004,24 @@ bool BlinkerMQTT::autoInit()
 
     if (checkConfig())
     {
-
-        WiFi.begin();
+    #ifdef ESP8266
+        struct station_config conf;
+        wifi_station_get_config_default(&conf);
+        WiFi.begin(reinterpret_cast<char*>(conf.ssid), reinterpret_cast<char*>(conf.password));
+    #elif defined(ESP32)
+        wifi_config_t conf;
+        esp_wifi_get_config(WIFI_IF_STA, &conf);
+        WiFi.begin(reinterpret_cast<char*>(conf.sta.ssid), reinterpret_cast<char*>(conf.sta.password));
+    #endif
+        // WiFi.begin(WiFi.SSID(), WiFi.psk());
         ::delay(500);
 
         // BLINKER_LOG(BLINKER_F("Waiting for WiFi "),
         //             BLINKER_WIFI_AUTO_INIT_TIMEOUT / 1000,
         //             BLINKER_F("s, will enter SMARTCONFIG or "),
         //             BLINKER_F("APCONFIG while WiFi not connect!"));
 
-        BLINKER_LOG(BLINKER_F("Connecting to WiFi"));
+        BLINKER_LOG(BLINKER_F("Connecting to WiFi: "), WiFi.SSID());
 
         // uint8_t _times = 0;
         // while (WiFi.status() != WL_CONNECTED) {

src/Blinker/BlinkerConfig.h

@@ -5,7 +5,7 @@
 // #include "Blinker/BlinkerUtility.h"
 #include "../Server/BlinkerServer.h"
 
-#define BLINKER_VERSION                 "0.3.80210609"
+#define BLINKER_VERSION                 "0.3.80210611"
 
 #define BLINKER_CONNECT_TIMEOUT_MS      10000UL
 

src/Functions/BlinkerDuerOS.h

@@ -265,9 +265,9 @@ class BLINKERDUEROS
         {
             String payload = BLINKER_F("\"");
             payload += STRING_format(BLINKER_CMD_TEMP);
-            payload += BLINKER_F("\":\"");
+            payload += BLINKER_F("\":[\"\",");
             payload += STRING_format(_temp);
-            payload += BLINKER_F("\"");
+            payload += BLINKER_F("]");
 
             // Blinker.DuerOSPrint(payload);
 
@@ -285,9 +285,9 @@ class BLINKERDUEROS
         {
             String payload = BLINKER_F("\"");
             payload += STRING_format(BLINKER_CMD_TEMP);
-            payload += BLINKER_F("\":\"");
+            payload += BLINKER_F("\":[\"\",");
             payload += STRING_format(_temp);
-            payload += BLINKER_F("\"");
+            payload += BLINKER_F("]");
 
             // Blinker.DuerOSPrint(payload);
 
@@ -305,9 +305,9 @@ class BLINKERDUEROS
         {
             String payload = BLINKER_F("\"");
             payload += STRING_format(BLINKER_CMD_TEMP);
-            payload += BLINKER_F("\":\"");
+            payload += BLINKER_F("\":[\"\",");
             payload += STRING_format(_temp);
-            payload += BLINKER_F("\"");
+            payload += BLINKER_F("]");
 
             // Blinker.DuerOSPrint(payload);