update codes, upgrade NO SSL support codes & example

Author: i3water

examples/Blinker_Hello/Hello_WiFi_Without_SSL/Hello_WiFi_Without_SSL.ino

@@ -0,0 +1,95 @@
+/* *****************************************************************
+ *
+ * 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.2 or later ESP8266/Arduino package,
+ * if use ESP8266 with Blinker.
+ * https://github.com/esp8266/Arduino/releases
+ * 
+ * Make sure installed 1.0.4 or later ESP32/Arduino package,
+ * if use ESP32 with Blinker.
+ * https://github.com/espressif/arduino-esp32/releases
+ * 
+ * Docs: https://diandeng.tech/doc
+ *       https://github.com/blinker-iot/blinker-doc/wiki
+ * 
+ * *****************************************************************
+ * 
+ * Blinker 库下载地址:
+ * https://github.com/blinker-iot/blinker-library/archive/master.zip
+ * 
+ * Blinker 是一套跨硬件、跨平台的物联网解决方案，提供APP端、设备端、
+ * 服务器端支持，使用公有云服务进行数据传输存储。可用于智能家居、
+ * 数据监测等领域，可以帮助用户更好更快地搭建物联网项目。
+ * 
+ * 如果使用 ESP8266 接入 Blinker,
+ * 请确保安装了 2.7.2 或更新的 ESP8266/Arduino 支持包。
+ * https://github.com/esp8266/Arduino/releases
+ * 
+ * 如果使用 ESP32 接入 Blinker,
+ * 请确保安装了 1.0.4 或更新的 ESP32/Arduino 支持包。
+ * https://github.com/espressif/arduino-esp32/releases
+ * 
+ * 文档: https://diandeng.tech/doc
+ *       https://github.com/blinker-iot/blinker-doc/wiki
+ * 
+ * *****************************************************************/
+
+#define BLINKER_WIFI
+#define BLINKER_WITHOUT_SSL
+
+#include <Blinker.h>
+
+char auth[] = "6650efab7f0a";
+char ssid[] = "有没有wifi";
+char pswd[] = "i8888888";
+
+// 新建组件对象
+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);
+}
+
+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();
+}

keywords.txt

@@ -139,6 +139,7 @@ BLINKER_ESP_SMARTCONFIG	KEYWORD2
 BLINKER_APCONFIG	KEYWORD2
 BLINKER_BLE	KEYWORD2
 BLINKER_WIFI	KEYWORD2
+BLINKER_WITHOUT_SSL	KEYWORD2
 BLINKER_WIFI_AUTO	KEYWORD2
 BLINKER_LOWPOWER	KEYWORD2
 BLINKER_LOWPOWER_AIR202	KEYWORD2

src/Adapters/BlinkerMQTT.h

@@ -228,7 +228,11 @@ char*       BLINKER_RRPC_SUB_TOPIC_MQTT;
 uint16_t    MQTT_PORT_MQTT;
 
 #if defined(ESP8266)
-    BearSSL::WiFiClientSecure   client_mqtt;
+    #ifndef BLINKER_WITHOUT_SSL
+        BearSSL::WiFiClientSecure   client_mqtt;
+    #else
+        WiFiClient               client_mqtt;
+    #endif
     // WiFiClientSecure         client_mqtt;
 #elif defined(ESP32)
     WiFiClientSecure     client_s;
@@ -343,8 +347,10 @@ int BlinkerMQTT::connect()
     // BLINKER_LOG_ALL(BLINKER_F("MQTT_KEY_MQTT: "), MQTT_KEY_MQTT);
 
     #if defined(ESP8266)
-        client_mqtt.setInsecure();
-        ::delay(10);
+        #ifndef BLINKER_WITHOUT_SSL
+            client_mqtt.setInsecure();
+            ::delay(10);
+        #endif
     #endif
 
     if ((ret = mqtt_MQTT->connect()) != 0)
@@ -1914,13 +1920,16 @@ int BlinkerMQTT::connectServer() {
 //     String payload = _dataGet;
 
 
+    #ifndef BLINKER_WITHOUT_SSL
+        client_mqtt.stop();
 
-    client_mqtt.stop();
-
-    std::unique_ptr<BearSSL::WiFiClientSecure>client_s(new BearSSL::WiFiClientSecure);
+        std::unique_ptr<BearSSL::WiFiClientSecure>client_s(new BearSSL::WiFiClientSecure);
 
-    // client_s->setFingerprint(fingerprint);
-    client_s->setInsecure();
+        // client_s->setFingerprint(fingerprint);
+        client_s->setInsecure();
+    #else
+        WiFiClient               client_s;
+    #endif
 
     String url_iot = BLINKER_F("/api/v1/user/device/diy/auth?authKey=");
     url_iot += _authKey;
@@ -1929,18 +1938,29 @@ int BlinkerMQTT::connectServer() {
     url_iot += _miType;
     url_iot += BLINKER_F("&version=");
     url_iot += BLINKER_OTA_VERSION_CODE;
+    #ifndef BLINKER_WITHOUT_SSL
     url_iot += BLINKER_F("&protocol=mqtts");
+    #else
+    url_iot += BLINKER_F("&protocol=mqtt");
+    #endif
     // url_iot += BLINKER_OTA_VERSION_CODE;
 
-    url_iot = "https://" + host + url_iot;
-
+    #ifndef BLINKER_WITHOUT_SSL
+        url_iot = "https://" + host + url_iot;
+    #else
+        url_iot = "http://" + host + url_iot;
+    #endif
     HTTPClient http;
 
     String payload;
 
     BLINKER_LOG_ALL(BLINKER_F("[HTTP] begin: "), url_iot);
 
+    #ifndef BLINKER_WITHOUT_SSL
     if (http.begin(*client_s, url_iot)) {  // HTTPS
+    #else
+    if (http.begin(client_s, url_iot)) {
+    #endif
 
         // Serial.print("[HTTPS] GET...\n");
         // start connection and send HTTP header
@@ -2369,7 +2389,9 @@ int BlinkerMQTT::connectServer() {
     #if defined(ESP8266)
         // client_s->stop();
         // if (!isMQTTinit)
-        client_mqtt.setInsecure();
+        #ifndef BLINKER_WITHOUT_SSL
+            client_mqtt.setInsecure();
+        #endif
     #endif
     // connect();