Merge pull request #2 from HobbytronicsPK/HobbytronicsPK-patch-1

experimental
ahmeaqas · Jun 20, 2017 · b2a20be · b2a20be
2 parents b8546b6 + 1e193f6
commit b2a20be
Show file tree

Hide file tree

Showing 6 changed files with 177 additions and 881 deletions.
diff --git a/Examples/CallBack/CallBack.ino b/Examples/CallBack/CallBack.ino
@@ -1,31 +1,32 @@
-#include <ESP8266WiFi.h>
-#include <ESP8266httpUpdate.h>
-#include <ESP8266HTTPClient.h>
-#include <ArduinoJson.h>
-#include <FS.h>
-#include <ESPMetRED.h>
-
-const char* MQTT_PUBLISH_TOPIC = "ESPMetRED/OUT";
-const char* MQTT_SUBSCRIBE_TOPIC = "ESPMetRED/IN";
-const char* CLIENT_ID = "ESPMetRED";
-const char* WIFI_SSID = "Ahmed";
-const char* WIFI_PASSWORD = "Password";
-const char* MQTT_SERVER = "192.168.0.30";
-const char* MQTT_USER = "User_Name";
-const char* MQTT_PASSWORD = "Password"; 
-
-ESPMetRED client;
-
-void setup() {
-  client.setcallback(callback);
-}
-
-void callback(String mqtt_payload)
-{
-  Serial.println(mqtt_payload);
-}
-
-void loop() {
-  client.keepalive();
-
+#include <ESP8266WiFi.h>
+#include <PubSubClient.h>
+#include <ESP8266httpUpdate.h>
+#include <ESP8266HTTPClient.h>
+#include <ArduinoJson.h>
+#include <FS.h>
+#include <ESPMetRED.h>
+
+const char* MQTT_PUBLISH_TOPIC = "ESPMetRED/OUT";
+const char* MQTT_SUBSCRIBE_TOPIC = "ESPMetRED/IN";
+const char* CLIENT_ID = "ESPMetRED";
+const char* WIFI_SSID = "Ahmed";
+const char* WIFI_PASSWORD = "Password";
+const char* MQTT_SERVER = "192.168.0.30";
+const char* MQTT_USER = "User_Name";
+const char* MQTT_PASSWORD = "Password"; 
+
+ESPMetRED client;
+
+void setup() {
+  client.setCallback(callback);
+}
+
+void callback(String mqtt_payload)
+{
+  Serial.println(mqtt_payload);
+}
+
+void loop() {
+  client.keepalive();
+
 }
diff --git a/Examples/DHT22/DHT22.ino b/Examples/DHT22/DHT22.ino
@@ -1,80 +1,81 @@
-#include <ESP8266WiFi.h>
-#include <ESP8266httpUpdate.h>
-#include <ESP8266HTTPClient.h>
-#include <ArduinoJson.h>
-#include <FS.h>
-#include <ESPMetRED.h>
-#include <math.h>
-#include <DHT.h>
-
-const char* MQTT_PUBLISH_TOPIC = "ESPMetRED/OUT";
-const char* MQTT_SUBSCRIBE_TOPIC = "ESPMetRED/IN";
-const char* CLIENT_ID = "ESPMetRED";
-const char* WIFI_SSID = "Ahmed";
-const char* WIFI_PASSWORD = "Password";
-const char* MQTT_SERVER = "192.168.0.30";
-const char* MQTT_USER = "User_Name";
-const char* MQTT_PASSWORD = "Password"; 
-
-ESPMetRED client;
-
-#define DHTTYPE DHT22
-#define DHTPIN  13  // Pin to which DHT-22 is attached
-DHT dht(DHTPIN, DHTTYPE);
-
-unsigned long read_dht22 = 0;
-int Humidity = 0;
-int Temperature = 0;
-int HeatIndex = 0;
-
-void setup() {
-  dht.begin();
-}
-
-void loop() {
-  client.keepalive();
-  if ((millis() - read_dht22) > 2000)
-  {
-    read_dht22 = millis();
-    dhtProbe();
-  }
-
-}
-
-void dhtProbe()
-{
-  float h = dht.readHumidity();
-  int _h = round(h);
-  float t = dht.readTemperature();
-  int _t = round(t);
-  float hic = dht.computeHeatIndex(t, h, false);
-  int _hic = round(hic);
-
-  String sensor_data = "Humidity[" + String(h) + "%] Temperature[" + String(t) + "°C] Heat Index[" + String(hic) + "°C]";
-  Serial.println(sensor_data);
-
-  if (isnan(h) || isnan(t)) {
-    Serial.println("Failed to read from DHT sensor!");
-  }
-  else {
-    if ((_h != Humidity) || (_t != Temperature) || (_hic != HeatIndex))
-    {
-      Humidity = _h;
-      Temperature = _t;
-      HeatIndex = _hic;
-
-      StaticJsonBuffer<500> jsonBuffer;
-      JsonObject& json = jsonBuffer.createObject();
-
-      json["HUMIDITY"] = Humidity;
-      json["TEMPERATURE"] = Temperature;
-      json["HEATINDEX"] = HeatIndex;
-
-      String json_object;
-      json.printTo(json_object);
-      client.Publish(json_object);
-
-      Serial.println("DHT-22 sensor data published to server");
-    }
-  }
+#include <ESP8266WiFi.h>
+#include <PubSubClient.h>
+#include <ESP8266httpUpdate.h>
+#include <ESP8266HTTPClient.h>
+#include <ArduinoJson.h>
+#include <FS.h>
+#include <ESPMetRED.h>
+#include <math.h>
+#include <DHT.h>
+
+const char* MQTT_PUBLISH_TOPIC = "ESPMetRED/OUT";
+const char* MQTT_SUBSCRIBE_TOPIC = "ESPMetRED/IN";
+const char* CLIENT_ID = "ESPMetRED";
+const char* WIFI_SSID = "Ahmed";
+const char* WIFI_PASSWORD = "Password";
+const char* MQTT_SERVER = "192.168.0.30";
+const char* MQTT_USER = "User_Name";
+const char* MQTT_PASSWORD = "Password"; 
+
+ESPMetRED client;
+
+#define DHTTYPE DHT22
+#define DHTPIN  13  // Pin to which DHT-22 is attached
+DHT dht(DHTPIN, DHTTYPE);
+
+unsigned long read_dht22 = 0;
+int Humidity = 0;
+int Temperature = 0;
+int HeatIndex = 0;
+
+void setup() {
+  dht.begin();
+}
+
+void loop() {
+  client.keepalive();
+  if ((millis() - read_dht22) > 2000)
+  {
+    read_dht22 = millis();
+    dhtProbe();
+  }
+
+}
+
+void dhtProbe()
+{
+  float h = dht.readHumidity();
+  int _h = round(h);
+  float t = dht.readTemperature();
+  int _t = round(t);
+  float hic = dht.computeHeatIndex(t, h, false);
+  int _hic = round(hic);
+
+  String sensor_data = "Humidity[" + String(h) + "%] Temperature[" + String(t) + "°C] Heat Index[" + String(hic) + "°C]";
+  Serial.println(sensor_data);
+
+  if (isnan(h) || isnan(t)) {
+    Serial.println("Failed to read from DHT sensor!");
+  }
+  else {
+    if ((_h != Humidity) || (_t != Temperature) || (_hic != HeatIndex))
+    {
+      Humidity = _h;
+      Temperature = _t;
+      HeatIndex = _hic;
+
+      StaticJsonBuffer<500> jsonBuffer;
+      JsonObject& json = jsonBuffer.createObject();
+
+      json["HUMIDITY"] = Humidity;
+      json["TEMPERATURE"] = Temperature;
+      json["HEATINDEX"] = HeatIndex;
+
+      String json_object;
+      json.printTo(json_object);
+      client.Publish(json_object);
+
+      Serial.println("DHT-22 sensor data published to server");
+    }
+  }
 }
diff --git a/Examples/ESPMetRED/ESPMetRED.ino b/Examples/ESPMetRED/ESPMetRED.ino
@@ -1,26 +1,27 @@
-#include <ESP8266WiFi.h>
-#include <ESP8266httpUpdate.h>
-#include <ESP8266HTTPClient.h>
-#include <ArduinoJson.h>
-#include <FS.h>
-#include <ESPMetRED.h>
-
-const char* MQTT_PUBLISH_TOPIC = "ESPMetRED/OUT";
-const char* MQTT_SUBSCRIBE_TOPIC = "ESPMetRED/IN";
-const char* CLIENT_ID = "ESPMetRED";
-const char* WIFI_SSID = "Ahmed";
-const char* WIFI_PASSWORD = "Password";
-const char* MQTT_SERVER = "192.168.0.30";
-const char* MQTT_USER = "User_Name";
-const char* MQTT_PASSWORD = "Password"; 
-
-ESPMetRED client;
-
-void setup() {
-
-}
-
-void loop() {
-  client.keepalive();
-
+#include <ESP8266WiFi.h>
+#include <PubSubClient.h>
+#include <ESP8266httpUpdate.h>
+#include <ESP8266HTTPClient.h>
+#include <ArduinoJson.h>
+#include <FS.h>
+#include <ESPMetRED.h>
+
+const char* MQTT_PUBLISH_TOPIC = "ESPMetRED/OUT";
+const char* MQTT_SUBSCRIBE_TOPIC = "ESPMetRED/IN";
+const char* CLIENT_ID = "ESPMetRED";
+const char* WIFI_SSID = "Ahmed";
+const char* WIFI_PASSWORD = "Password";
+const char* MQTT_SERVER = "192.168.0.30";
+const char* MQTT_USER = "User_Name";
+const char* MQTT_PASSWORD = "Password"; 
+
+ESPMetRED client;
+
+void setup() {
+
+}
+
+void loop() {
+  client.keepalive();
+
 }
diff --git a/Examples/Relay/Relay.ino b/Examples/Relay/Relay.ino
@@ -3,6 +3,7 @@
  */
 
 #include <ESP8266WiFi.h>
+#include <PubSubClient.h>
 #include <ESP8266httpUpdate.h>
 #include <ESP8266HTTPClient.h>
 #include <ArduinoJson.h>