major changes v1.2

Author: SiddheshNan

examples/ESP32-example/ESP32-example.ino

@@ -0,0 +1,51 @@
+#include <WiFi.h>
+#include <ThingESP.h>
+
+ThingESP32 thing("username", "project_name", "credentials");
+
+int LED = 16;
+
+void setup()
+{
+  Serial.begin(115200);
+
+  pinMode(LED, OUTPUT);
+
+  thing.SetWiFi("wifi_ssid", "wifi_password");
+
+  thing.initDevice();
+
+}
+
+
+
+String HandleResponse(String query)
+{
+
+  if (query == "led on") {
+    digitalWrite(LED, 0);
+    return "Done: LED Turned ON";
+  }
+
+  else if (query == "led off") {
+    digitalWrite(LED, 1);
+    return "Done: LED Turned OFF";
+  }
+
+  else if (query == "led status")
+    return digitalRead(LED) ? "LED is OFF" : "LED is ON";
+
+
+  else return "Your query was invalid..";
+
+}
+
+
+
+
+void loop()
+{
+
+  thing.Handle();
+
+}

examples/ThingESP-example/ThingESP-example.ino renamed to examples/ESP8266-example/ESP8266-example.ino

@@ -1,7 +1,7 @@
 #include <ESP8266WiFi.h>
-#include <whesp8266.h>
+#include <ThingESP.h>
 
-WH_ESP8266 DeviceClient;
+ThingESP8266 thing("username", "project_name", "credentials");
 
 int LED = LED_BUILTIN;
 
@@ -10,13 +10,10 @@ void setup()
   Serial.begin(115200);
 
   pinMode(LED, OUTPUT);
-  digitalWrite(LED, 1);
 
-  DeviceClient.SetDevice("username", "project_name", "credentials");
+  thing.SetWiFi("wifi_ssid", "wifi_password");
 
-  DeviceClient.SetWiFi("ssid", "pass");
-
-  DeviceClient.initDevice();
+  thing.initDevice();
 
 }
 
@@ -49,6 +46,6 @@ String HandleResponse(String query)
 void loop()
 {
 
-  DeviceClient.Handle();
+  thing.Handle();
 
 }

library.properties

@@ -1,5 +1,5 @@
 name=ThingESP
-version=1.0.1
+version=1.2.0
 author=SiddheshNan <hello@siddhesh.me>
 maintainer=SiddheshNan <hello@siddhesh.me>
 sentence=Arduino library for the ThingsESP Platform.

src/ThingESP.h

@@ -0,0 +1,6 @@
+#define MQTT_MAX_PACKET_SIZE 1024
+#if defined(ESP8266)
+#include "ThingESP_8266.cpp"
+#elif defined (ESP32)
+#include "ThingESP_32.cpp"
+#endif

src/whesp8266.cpp renamed to src/ThingESP_32.cpp

@@ -1,32 +1,27 @@
 #if defined(ESP8266)
 #include <ESP8266WiFi.h>
-#else
+#elif defined (ESP32)
 #include <WiFi.h>
 #endif
 #include "PubSubClient/PubSubClient.h"
 #include "ArduinoJson.h"
-//#include <string.h>
-//WiFiClient espClient;
-//PubSubClient client(espClient);
-   
+
 String HandleResponse(String query);
 
-class WH_ESP8266
+class ThingESP32
 {
 public:
-  WH_ESP8266()
+  ThingESP32(String username, String deviceName, String password)
   {
- WiFiClient espClient;
+    WiFiClient espClient;
     PubSubClient client(espClient);
     this->client = client;
-  };
-
-  void SetDevice(String username, String deviceName, String password)
-  {
     this->Username = username;
     this->DeviceName = deviceName;
     this->Password = password;
-  }
+  };
+
+ 
   void SetWiFi(const char *ssID, const char *ssID_password)
   {
     this->ssid = ssID;
@@ -174,7 +169,7 @@ class WH_ESP8266
 
     this->client.setServer(this->mqttServer, this->mqttPort);
     this->client.setCallback([this](char *topic, byte *payload, unsigned int length) {
-      this->callback(topic, payload, length);
+     callback(topic, payload, length);
     });
   }
 };

src/ThingESP_8266.cpp

@@ -0,0 +1,176 @@
+#if defined(ESP8266)
+#include <ESP8266WiFi.h>
+#elif defined (ESP32)
+#include <WiFi.h>
+#endif
+
+#include "PubSubClient/PubSubClient.h"
+#include "ArduinoJson.h"
+
+String HandleResponse(String query);
+
+class ThingESP8266
+{
+public:
+  ThingESP8266(String username, String deviceName, String password)
+  {
+    WiFiClient espClient;
+    PubSubClient client(espClient);
+    this->client = client;
+    this->Username = username;
+    this->DeviceName = deviceName;
+    this->Password = password;
+  };
+
+ 
+  void SetWiFi(const char *ssID, const char *ssID_password)
+  {
+    this->ssid = ssID;
+    this->ssid_password = ssID_password;
+  }
+
+  void logic(String data)
+  {
+    DynamicJsonDocument data_in(1024);
+    DynamicJsonDocument data_out(1024);
+    deserializeJson(data_in, data);
+
+    if (data_in["action"] == "query")
+    {
+      data_out["msg_id"] = data_in["msg_id"];
+      data_out["action"] = "returned_api_response";
+      String query = data_in["query"];
+      query.toLowerCase();
+      data_out["returned_api_response"] = HandleResponse(query);
+      String outdata;
+      serializeJson(data_out, outdata);
+      publishMSG(outdata.c_str());
+    }
+  };
+
+  void sendMsg(String number, String msg)
+  {
+    DynamicJsonDocument data_out(1024);
+    data_out["action"] = "device_call";
+    data_out["to_number"] = number;
+    data_out["msg"] = msg;
+    String outdata;
+    serializeJson(data_out, outdata);
+    publishMSG(outdata.c_str());
+  }
+
+  void initDevice()
+  {
+  //  this->client = client;
+    this->topic = this->DeviceName + "/" + this->Username;
+    this->outname = this->DeviceName + "@" + this->Username;
+
+    this->char_DeviceName = this->DeviceName.c_str();
+    this->char_Password = this->Password.c_str();
+    this->char_outname = this->outname.c_str();
+    this->char_topic = this->topic.c_str();
+    this->initiated = true;
+
+    this->setupIT();
+  }
+
+  void Handle()
+  {
+    if (!client.connected())
+    {
+      while (!client.connected())
+      {
+        Serial.print("Attempting connection...");
+        if (client.connect(this->char_outname, this->char_outname, this->char_Password))
+        {
+          Serial.println("connected");
+          client.subscribe(this->char_topic);
+        }
+        else
+        {
+          Serial.print("failed, rc=");
+          Serial.print(this->client.state());
+          Serial.println(" try again in 5 seconds");
+          delay(5000);
+        }
+      }
+    }
+    this->client.loop();
+  }
+
+  void publishMSG(const char *info)
+  {
+    client.publish(this->char_topic, info);
+  }
+
+  void SetHost(const char *host)
+  {
+    this->mqttServer = host;
+  }
+
+private:
+  String Username;
+  String DeviceName;
+  String Password;
+
+  bool initiated = false;
+
+  const char *ssid;
+  const char *ssid_password;
+
+  const char *mqttServer = "thingesp.siddhesh.me";
+  int mqttPort = 1893;
+
+  String topic;
+  String outname;
+  const char *char_DeviceName;
+  const char *char_Password;
+  const char *char_outname;
+  const char *char_topic;
+
+  PubSubClient client;
+
+  void callback(char *topic, byte *payload, unsigned int length)
+  {
+    String srr;
+    Serial.println();
+    Serial.print("Message arrived [");
+    Serial.print(topic);
+    Serial.print("] ");
+    Serial.println();
+    for (int i = 0; i < length; i++)
+    {
+      Serial.print((char)payload[i]);
+      srr.concat((char)payload[i]);
+    }
+    this->logic(srr);
+  }
+
+  void setupIT()
+  {
+
+    Serial.println();
+    Serial.print("Connecting to ");
+    Serial.println(ssid);
+
+    WiFi.begin(ssid, ssid_password);
+
+    while (WiFi.status() != WL_CONNECTED)
+    {
+      delay(500);
+      Serial.print(".");
+    }
+
+    randomSeed(micros());
+
+    Serial.println("");
+    Serial.println("WiFi connected");
+    Serial.println("IP address: ");
+    Serial.println(WiFi.localIP());
+
+    this->client.setServer(this->mqttServer, this->mqttPort);
+    this->client.setCallback([this](char *topic, byte *payload, unsigned int length) {
+     callback(topic, payload, length);
+    });
+  }
+};