update codes, upgrade BLINKER WIFI CONFIG & MQTT codes.

Author: i3water

examples/Blinker_MQTT/MQTT_PUB/MQTT_PUB.ino

@@ -0,0 +1,100 @@
+/* *****************************************************************
+ *
+ * Download latest Blinker library here:
+ * https://github.com/blinker-iot/blinker-library/archive/master.zip
+ * 
+ * 
+ * Blinker is a cross-hardware, cross-platform solution for the IoT. 
+ * It provides APP, device and server support, 
+ * and uses public cloud services for data transmission and storage.
+ * It can be used in smart home, data monitoring and other fields 
+ * to help users build Internet of Things projects better and faster.
+ * 
+ * Make sure installed 2.7.4 or later ESP8266/Arduino package,
+ * if use ESP8266 with Blinker.
+ * https://github.com/esp8266/Arduino/releases
+ * 
+ * Make sure installed 1.0.5 or later ESP32/Arduino package,
+ * if use ESP32 with Blinker.
+ * https://github.com/espressif/arduino-esp32/releases
+ * 
+ * Docs: https://diandeng.tech/doc
+ *       
+ * 
+ * *****************************************************************
+ * 
+ * Blinker 库下载地址:
+ * https://github.com/blinker-iot/blinker-library/archive/master.zip
+ * 
+ * Blinker 是一套跨硬件、跨平台的物联网解决方案，提供APP端、设备端、
+ * 服务器端支持，使用公有云服务进行数据传输存储。可用于智能家居、
+ * 数据监测等领域，可以帮助用户更好更快地搭建物联网项目。
+ * 
+ * 如果使用 ESP8266 接入 Blinker,
+ * 请确保安装了 2.7.4 或更新的 ESP8266/Arduino 支持包。
+ * https://github.com/esp8266/Arduino/releases
+ * 
+ * 如果使用 ESP32 接入 Blinker,
+ * 请确保安装了 1.0.5 或更新的 ESP32/Arduino 支持包。
+ * https://github.com/espressif/arduino-esp32/releases
+ * 
+ * 文档: https://diandeng.tech/doc
+ *       
+ * 
+ * *****************************************************************/
+
+#define BLINKER_WIFI
+
+#include <Blinker.h>
+
+char auth[] = "Your Device Secret Key";
+char ssid[] = "Your WiFi network SSID or name";
+char pswd[] = "Your WiFi network WPA password or WEP key";
+
+// 新建组件对象
+BlinkerButton Button1("btn-abc");
+BlinkerNumber Number1("num-abc");
+
+int counter = 0;
+
+// 按下按键即会执行该函数
+void button1_callback(const String & state)
+{
+    BLINKER_LOG("get button state: ", state);
+    digitalWrite(LED_BUILTIN, !digitalRead(LED_BUILTIN));
+}
+
+// 如果未绑定的组件被触发，则会执行其中内容
+void dataRead(const String & data)
+{
+    BLINKER_LOG("Blinker readString: ", data);
+    counter++;
+    Number1.print(counter);
+
+    if (BLINKER_PROTOCOL_MQTT != NULL) {
+        String pub_topic = "/device/" + Blinker.deviceName() + "/s";
+        String pub_data = "{\"toDevice\":\"the device name you need pub to\",\"data\":{\"hello\":\"blinker\"}}";
+        BLINKER_PROTOCOL_MQTT->publish(pub_topic.c_str(), pub_data.c_str());
+    }
+}
+
+void setup()
+{
+    // 初始化串口
+    Serial.begin(115200);
+    BLINKER_DEBUG.stream(Serial);
+    BLINKER_DEBUG.debugAll();
+    
+    // 初始化有LED的IO
+    pinMode(LED_BUILTIN, OUTPUT);
+    digitalWrite(LED_BUILTIN, HIGH);
+    // 初始化blinker
+    Blinker.begin(auth, ssid, pswd);
+    Blinker.attachData(dataRead);
+
+    Button1.attach(button1_callback);
+}
+
+void loop() {
+    Blinker.run();
+}

examples/Blinker_PRO/Blinker_PRO_Wlan_Config/Blinker_PRO_Wlan_Config.ino

@@ -168,7 +168,7 @@ void duringLongPress()
 
     if (pressed_time >= 5000 && Blinker.configType() != BLINKER_AP_CONFIG)
     {
-        Blinker.apConfigInit();
+        Blinker.esptouchInit();
     }
 }
 #endif

keywords.txt

@@ -21,11 +21,13 @@ BlinkerDuerOS	KEYWORD1
 BlinkerMIOT	KEYWORD1
 BlinkerUpdater	KEYWORD1
 BlinkerEvent	KEYWORD1
+BLINKER_PROTOCOL_MQTT	KEYWORD1
 
 #######################################
 # Methods and Functions (KEYWORD2)
 #######################################
 BLINKER_TAST_INIT	KEYWORD2
+deviceName	KEYWORD2
 
 auth	KEYWORD2
 ssid	KEYWORD2

src/Adapters/BlinkerMQTT.h

@@ -268,8 +268,10 @@ class BlinkerMQTT : public BlinkerStream
     WiFiClientSecure     client_s;
 #endif
 
+#define BLINKER_PROTOCOL_MQTT    mqtt_MQTT
+
 WiFiClient               client;
-Adafruit_MQTT_Client*    mqtt_MQTT;
+Adafruit_MQTT_Client*    mqtt_MQTT = NULL;
 // Adafruit_MQTT_Publish   *iotPub;
 Adafruit_MQTT_Subscribe* iotSub_MQTT;
 // Adafruit_MQTT_Subscribe* iotSub_RRPC_MQTT;

src/Adapters/BlinkerPROESP.h

@@ -226,8 +226,10 @@ class BlinkerPROESP : public BlinkerStream
     WiFiClientSecure            client_s;
 #endif
 
+#define BLINKER_PROTOCOL_MQTT    mqtt_PRO
+
 WiFiClient              client;
-Adafruit_MQTT_Client*       mqtt_PRO;
+Adafruit_MQTT_Client*       mqtt_PRO = NULL;
 // Adafruit_MQTT_Publish   *iotPub;
 Adafruit_MQTT_Subscribe*    iotSub_PRO;
 

src/Blinker.h

@@ -42,7 +42,8 @@
     #if (defined(ESP8266) || defined(ESP32)) && !defined(BLINKER_MQTT_AT)
         #include "BlinkerESPMQTT.h"
 
-        BlinkerESPMQTT      Blinker;     
+        BlinkerESPMQTT      Blinker; 
+
     #else
         #define BLINKER_ESP_AT