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

Dev 3.0

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

library.json

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

library.properties

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

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;
@@ -2837,6 +2839,7 @@ bool BlinkerMQTT::checkInit()
                             if (millis() - _connectTime > 15000)
                             {
                                 BLINKER_LOG(BLINKER_F("APConfig timeout."));
+                                WiFi.disconnect();
                                 _configStatus = APCFG_TIMEOUT;
                             }
                             return false;

src/Adapters/BlinkerPROESP.h

@@ -64,7 +64,7 @@ enum b_broker_t {
     blinker_b
 };
 
-b_config_t  _configType = BLINKER_SMART_CONFIG;
+b_config_t  _configType = BLINKER_AP_CONFIG;
 
 class BlinkerPROESP : public BlinkerStream
 {
@@ -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;
 
@@ -3237,6 +3239,7 @@ bool BlinkerWlan::connected() {
                     BLINKER_LOG(BLINKER_F("APConfig time out"));
 
                     // WiFi.stopSmartConfig();
+                    WiFi.disconnect();
                     _status = BWL_APCONFIG_TIMEOUT;
                 }
                 return false;

src/Blinker.h

@@ -25,6 +25,11 @@
 
 #elif defined(BLINKER_WIFI) || defined(BLINKER_MQTT)
 
+    #if defined(BLINKER_APCONFIG_V2)
+        #define BLINKER_APCONFIG
+        #define BLINKER_WITHOUT_WS_REG
+    #endif
+
     #if defined(BLINKER_WIFI)
         #undef BLINKER_WIFI
         #define BLINKER_MQTT
@@ -37,7 +42,8 @@
     #if (defined(ESP8266) || defined(ESP32)) && !defined(BLINKER_MQTT_AT)
         #include "BlinkerESPMQTT.h"
 
-        BlinkerESPMQTT      Blinker;     
+        BlinkerESPMQTT      Blinker; 
+
     #else
         #define BLINKER_ESP_AT
 
@@ -92,7 +98,14 @@
 
 #elif defined(BLINKER_PRO_ESP) || defined(BLINKER_WIFI_AUTO)
 
-    #include "BlinkerAssistant.h"
+    #include "BlinkerAssistant.h"    
+
+    #if defined(BLINKER_APCONFIG_V2)
+        #define BLINKER_APCONFIG
+        #define BLINKER_WITHOUT_WS_REG
+    #endif
+    
+    #define BLINKER_WITHOUT_WS_REG
 
     #if defined(BLINKER_WIFI_AUTO)
         #define BLINKER_PRO_ESP

src/Blinker/BlinkerApi.h

@@ -3242,6 +3242,10 @@ void BlinkerApi::run()
                     }
                     else
                     {
+                        #if defined(BLINKER_WITHOUT_WS_REG)
+                            _getRegister = true;
+                            _isNew = true;
+                        #endif
                         _proStatus = PRO_DEV_AUTHCHECK_FAIL;
 
                         BLINKER_LOG_ALL(BLINKER_F("not auth, conn deviceRegister"));
@@ -3476,6 +3480,10 @@ void BlinkerApi::run()
                     }
                     else
                     {
+                        #if defined(BLINKER_WITHOUT_WS_REG)
+                            _getRegister = true;
+                            _isNew = true;
+                        #endif
                         _mqttAutoStatue = AUTO_DEV_AUTHCHECK_FAIL;
 
                         BLINKER_LOG_ALL(BLINKER_F("not auth, conn deviceRegister"));

src/Blinker/BlinkerConfig.h

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