Merge pull request #278 from blinker-iot/dev_2.0

update codes, upgrade BLINKER WIF & MQTT codes
blinker-iot · Dec 16, 2018 · dc8fc08 · dc8fc08
2 parents 8dd2284 + b71e2af
commit dc8fc08
Show file tree

Hide file tree

Showing 46 changed files with 617 additions and 1,039 deletions.
diff --git a/examples/Blinker_AHRS/AHRS_WiFi/AHRS_WiFi.ino b/examples/Blinker_AHRS/AHRS_WiFi/AHRS_WiFi.ino
@@ -30,6 +30,7 @@
 
 #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";
 
@@ -55,7 +56,7 @@ void setup()
     pinMode(LED_BUILTIN, OUTPUT);
     digitalWrite(LED_BUILTIN, LOW);
 
-    Blinker.begin(ssid, pswd);
+    Blinker.begin(auth, ssid, pswd);
     Blinker.attachData(dataRead);
     Blinker.attachAhrs();
 }

diff --git a/examples/Blinker_APCONFIG/APCONFIG_WiFi/APCONFIG_WiFi.ino b/examples/Blinker_APCONFIG/APCONFIG_WiFi/APCONFIG_WiFi.ino
@@ -31,6 +31,8 @@
 
 #include <Blinker.h>
 
+char auth[] = "Your Device Secret Key";
+
 void dataRead(const String & data)
 {
     BLINKER_LOG("Blinker readString: ", data);
@@ -53,7 +55,7 @@ void setup()
     pinMode(LED_BUILTIN, OUTPUT);
     digitalWrite(LED_BUILTIN, LOW);
 
-    Blinker.begin();
+    Blinker.begin(auth);
     Blinker.attachData(dataRead);
 }
 

diff --git a/examples/Blinker_AQI/AQI_MQTT/AQI_MQTT.ino → examples/Blinker_AQI/AQI_WiFi/AQI_WiFi.ino b/examples/Blinker_AQI/AQI_MQTT/AQI_MQTT.ino → examples/Blinker_AQI/AQI_WiFi/AQI_WiFi.ino
@@ -1,71 +1,71 @@
-/* *****************************************************************
- *
- * Download latest Blinker library here:
- * https://github.com/blinker-iot/blinker-library/archive/master.zip
- * 
- * 
- * Blinker is a platform with iOS and Android apps to 
- * control embedded hardware like Arduino, Raspberrt Pi.
- * You can easily build graphic interfaces for all your 
- * projects by simply dragging and dropping widgets.
- * 
- * Docs: https://doc.blinker.app/
- *       https://github.com/blinker-iot/blinker-doc/wiki
- * 
- * *****************************************************************
- * 
- * Blinker 库下载地址:
- * https://github.com/blinker-iot/blinker-library/archive/master.zip
- * 
- * Blinker 是一个运行在 IOS 和 Android 上用于控制嵌入式硬件的应用程序。
- * 你可以通过拖放控制组件，轻松地为你的项目建立图形化控制界面。
- * 
- * 文档: https://doc.blinker.app/
- *       https://github.com/blinker-iot/blinker-doc/wiki
- * 
- * *****************************************************************/
-
-#define BLINKER_PRINT Serial
-#define BLINKER_MQTT
-
-#include <Blinker.h>
-
-char auth[] = "Your MQTT Secret Key";
-char ssid[] = "Your WiFi network SSID or name";
-char pswd[] = "Your WiFi network WPA password or WEP key";
-
-void dataRead(const String & data)
-{
-    BLINKER_LOG("Blinker readString: ", data);
-
-    uint32_t BlinkerTime = millis();
-
-    Blinker.vibrate();        
-    Blinker.print("millis", BlinkerTime);
-
-    digitalWrite(LED_BUILTIN, !digitalRead(LED_BUILTIN));
-    String get_aqi = Blinker.aqi();
-    BLINKER_LOG("AQI: ", get_aqi);
-
-    Blinker.delay(60000);
-}
-
-void setup()
-{
-    Serial.begin(115200);
-
-    #if defined(BLINKER_PRINT)
-        BLINKER_DEBUG.stream(BLINKER_PRINT);
-    #endif
-
-    pinMode(LED_BUILTIN, OUTPUT);
-    digitalWrite(LED_BUILTIN, LOW);
-
-    Blinker.begin(auth, ssid, pswd);
-    Blinker.attachData(dataRead);
-}
-
-void loop()
-{
-    Blinker.run();
+/* *****************************************************************
+ *
+ * Download latest Blinker library here:
+ * https://github.com/blinker-iot/blinker-library/archive/master.zip
+ * 
+ * 
+ * Blinker is a platform with iOS and Android apps to 
+ * control embedded hardware like Arduino, Raspberrt Pi.
+ * You can easily build graphic interfaces for all your 
+ * projects by simply dragging and dropping widgets.
+ * 
+ * Docs: https://doc.blinker.app/
+ *       https://github.com/blinker-iot/blinker-doc/wiki
+ * 
+ * *****************************************************************
+ * 
+ * Blinker 库下载地址:
+ * https://github.com/blinker-iot/blinker-library/archive/master.zip
+ * 
+ * Blinker 是一个运行在 IOS 和 Android 上用于控制嵌入式硬件的应用程序。
+ * 你可以通过拖放控制组件，轻松地为你的项目建立图形化控制界面。
+ * 
+ * 文档: https://doc.blinker.app/
+ *       https://github.com/blinker-iot/blinker-doc/wiki
+ * 
+ * *****************************************************************/
+
+#define BLINKER_PRINT Serial
+#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";
+
+void dataRead(const String & data)
+{
+    BLINKER_LOG("Blinker readString: ", data);
+
+    uint32_t BlinkerTime = millis();
+
+    Blinker.vibrate();        
+    Blinker.print("millis", BlinkerTime);
+
+    digitalWrite(LED_BUILTIN, !digitalRead(LED_BUILTIN));
+    String get_aqi = Blinker.aqi();
+    BLINKER_LOG("AQI: ", get_aqi);
+
+    Blinker.delay(60000);
+}
+
+void setup()
+{
+    Serial.begin(115200);
+
+    #if defined(BLINKER_PRINT)
+        BLINKER_DEBUG.stream(BLINKER_PRINT);
+    #endif
+
+    pinMode(LED_BUILTIN, OUTPUT);
+    digitalWrite(LED_BUILTIN, LOW);
+
+    Blinker.begin(auth, ssid, pswd);
+    Blinker.attachData(dataRead);
+}
+
+void loop()
+{
+    Blinker.run();
 }
diff --git a/...are/AT_Firmware_MQTT/AT_Firmware_MQTT.ino → ...are/AT_Firmware_WiFi/AT_Firmware_WiFi.ino b/...are/AT_Firmware_MQTT/AT_Firmware_MQTT.ino → ...are/AT_Firmware_WiFi/AT_Firmware_WiFi.ino
diff --git a/...ples/Blinker_AUTO/AUTO_MQTT/AUTO_MQTT.ino → ...ples/Blinker_AUTO/AUTO_WiFi/AUTO_WiFi.ino b/...ples/Blinker_AUTO/AUTO_MQTT/AUTO_MQTT.ino → ...ples/Blinker_AUTO/AUTO_WiFi/AUTO_WiFi.ino
@@ -1,79 +1,79 @@
-/* *****************************************************************
- *
- * Download latest Blinker library here:
- * https://github.com/blinker-iot/blinker-library/archive/master.zip
- * 
- * 
- * Blinker is a platform with iOS and Android apps to 
- * control embedded hardware like Arduino, Raspberrt Pi.
- * You can easily build graphic interfaces for all your 
- * projects by simply dragging and dropping widgets.
- * 
- * Docs: https://doc.blinker.app/
- *       https://github.com/blinker-iot/blinker-doc/wiki
- * 
- * *****************************************************************
- * 
- * Blinker 库下载地址:
- * https://github.com/blinker-iot/blinker-library/archive/master.zip
- * 
- * Blinker 是一个运行在 IOS 和 Android 上用于控制嵌入式硬件的应用程序。
- * 你可以通过拖放控制组件，轻松地为你的项目建立图形化控制界面。
- * 
- * 文档: https://doc.blinker.app/
- *       https://github.com/blinker-iot/blinker-doc/wiki
- * 
- * *****************************************************************/
-
-/*
- *
- *  This example not complete at all, TODO.
- * 
- * /
-
-// #define BLINKER_PRINT Serial
-// #define BLINKER_MQTT
-
-// #include <Blinker.h>
-
-// char auth[] = "Your MQTT Secret Key";
-// char ssid[] = "Your WiFi network SSID or name";
-// char pswd[] = "Your WiFi network WPA password or WEP key";
-
-// #define BUTTON_1 "ButtonKey"
-
-// void setup() {
-//     Serial.begin(115200);
-
-//     pinMode(LED_BUILTIN, OUTPUT);
-//     digitalWrite(LED_BUILTIN, LOW);
-
-//     Blinker.begin(auth, ssid, pswd);
-//     Blinker.beginAuto();
-//     Blinker.wInit(BUTTON_1, W_BUTTON);
-// }
-
-// void loop()
-// {
-//     Blinker.run();
-
-//     if (Blinker.available()) {
-//         BLINKER_LOG("Blinker readString: ", data);
-
-//         uint32_t BlinkerTime = millis();
-
-//         Blinker.beginFormat();
-//         Blinker.vibrate();        
-//         Blinker.print("millis", BlinkerTime);
-//         Blinker.endFormat();
-//     }
-
-//     if (Blinker.button(BUTTON_1)) {
-//         digitalWrite(LED_BUILTIN, !digitalRead(LED_BUILTIN));
-//     }
-
-//     Blinker.autoInput("key", "value");
-//     Blinker.autoRun();
-
-//     Blinker.delay(1000);
+/* *****************************************************************
+ *
+ * Download latest Blinker library here:
+ * https://github.com/blinker-iot/blinker-library/archive/master.zip
+ * 
+ * 
+ * Blinker is a platform with iOS and Android apps to 
+ * control embedded hardware like Arduino, Raspberrt Pi.
+ * You can easily build graphic interfaces for all your 
+ * projects by simply dragging and dropping widgets.
+ * 
+ * Docs: https://doc.blinker.app/
+ *       https://github.com/blinker-iot/blinker-doc/wiki
+ * 
+ * *****************************************************************
+ * 
+ * Blinker 库下载地址:
+ * https://github.com/blinker-iot/blinker-library/archive/master.zip
+ * 
+ * Blinker 是一个运行在 IOS 和 Android 上用于控制嵌入式硬件的应用程序。
+ * 你可以通过拖放控制组件，轻松地为你的项目建立图形化控制界面。
+ * 
+ * 文档: https://doc.blinker.app/
+ *       https://github.com/blinker-iot/blinker-doc/wiki
+ * 
+ * *****************************************************************/
+
+/*
+ *
+ *  This example not complete at all, TODO.
+ * 
+ * /
+
+// #define BLINKER_PRINT Serial
+// #define BLINKER_MQTT
+
+// #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";
+
+// #define BUTTON_1 "ButtonKey"
+
+// void setup() {
+//     Serial.begin(115200);
+
+//     pinMode(LED_BUILTIN, OUTPUT);
+//     digitalWrite(LED_BUILTIN, LOW);
+
+//     Blinker.begin(auth, ssid, pswd);
+//     Blinker.beginAuto();
+//     Blinker.wInit(BUTTON_1, W_BUTTON);
+// }
+
+// void loop()
+// {
+//     Blinker.run();
+
+//     if (Blinker.available()) {
+//         BLINKER_LOG("Blinker readString: ", data);
+
+//         uint32_t BlinkerTime = millis();
+
+//         Blinker.beginFormat();
+//         Blinker.vibrate();        
+//         Blinker.print("millis", BlinkerTime);
+//         Blinker.endFormat();
+//     }
+
+//     if (Blinker.button(BUTTON_1)) {
+//         digitalWrite(LED_BUILTIN, !digitalRead(LED_BUILTIN));
+//     }
+
+//     Blinker.autoInput("key", "value");
+//     Blinker.autoRun();
+
+//     Blinker.delay(1000);
 // }
diff --git a/examples/Blinker_AliGenie/AliGenie_LIGHT/AliGenie_LIGHT.ino b/examples/Blinker_AliGenie/AliGenie_LIGHT/AliGenie_LIGHT.ino
@@ -26,12 +26,12 @@
  * *****************************************************************/
 
 #define BLINKER_PRINT Serial
-#define BLINKER_MQTT
+#define BLINKER_WIFI
 #define BLINKER_ALIGENIE_LIGHT
 
 #include <Blinker.h>
 
-char auth[] = "Your MQTT Secret Key";
+char auth[] = "Your Device Secret Key";
 char ssid[] = "Your WiFi network SSID or name";
 char pswd[] = "Your WiFi network WPA password or WEP key";
 

diff --git a/examples/Blinker_AliGenie/AliGenie_OUTLET/AliGenie_OUTLET.ino b/examples/Blinker_AliGenie/AliGenie_OUTLET/AliGenie_OUTLET.ino
@@ -26,12 +26,12 @@
  * *****************************************************************/
 
 #define BLINKER_PRINT Serial
-#define BLINKER_MQTT
+#define BLINKER_WIFI
 #define BLINKER_ALIGENIE_OUTLET
 
 #include <Blinker.h>
 
-char auth[] = "Your MQTT Secret Key";
+char auth[] = "Your Device Secret Key";
 char ssid[] = "Your WiFi network SSID or name";
 char pswd[] = "Your WiFi network WPA password or WEP key";
 

diff --git a/examples/Blinker_AliGenie/AliGenie_SENSOR/AliGenie_SENSOR.ino b/examples/Blinker_AliGenie/AliGenie_SENSOR/AliGenie_SENSOR.ino
@@ -26,12 +26,12 @@
  * *****************************************************************/
 
 #define BLINKER_PRINT Serial
-#define BLINKER_MQTT
+#define BLINKER_WIFI
 #define BLINKER_ALIGENIE_SENSOR
 
 #include <Blinker.h>
 
-char auth[] = "Your MQTT Secret Key";
+char auth[] = "Your Device Secret Key";
 char ssid[] = "Your WiFi network SSID or name";
 char pswd[] = "Your WiFi network WPA password or WEP key";
 

diff --git a/...son/ArduinoJson_MQTT/ArduinoJson_MQTT.ino → ...son/ArduinoJson_WiFi/ArduinoJson_WiFi.ino b/...son/ArduinoJson_MQTT/ArduinoJson_MQTT.ino → ...son/ArduinoJson_WiFi/ArduinoJson_WiFi.ino
@@ -26,11 +26,11 @@
  * *****************************************************************/
 
 #define BLINKER_PRINT Serial
-#define BLINKER_MQTT
+#define BLINKER_WIFI
 
 #include <Blinker.h>
 
-char auth[] = "Your MQTT Secret Key";
+char auth[] = "Your Device Secret Key";
 char ssid[] = "Your WiFi network SSID or name";
 char pswd[] = "Your WiFi network WPA password or WEP key";