typo fixes

Author: SiddheshNan

src/ThingESPClient.cpp

@@ -1,15 +1,13 @@
 #pragma once
 
 #if defined(ESP8266)
-#include <ESP8266WiFi.h>
+    #include <ESP8266WiFi.h>
 #elif defined(ESP32)
-#include <WiFi.h>
+    #include <WiFi.h>
 #endif
 
 #ifndef _DISABLE_TLS_
-
-#include <WiFiClientSecure.h>
-
+    #include <WiFiClientSecure.h>
 #endif
 
 #include <stdint.h>
@@ -37,7 +35,7 @@ namespace thing_esp {
             projectName = _projectName;
             credentials = _credentials;
 
-            genMetaData();
+            this->genMetaData();
         };
 
         void initDevice() {
@@ -72,7 +70,7 @@ namespace thing_esp {
 
                     if (client.connect(outName.c_str(), outName.c_str(), credentials)) {
                         LOG("SOCKET", "Connected to ThingESP successfully")
-                        client.subscribe(topic.c_str());
+                        client.subscribe(c_topic);
                         publishMSG(get_rate_limits_msg());
                     } else {
                         LOG_VALUE("SOCKET", "Error connecting to ThingESP! Error code: ", client.state());
@@ -93,9 +91,7 @@ namespace thing_esp {
         /*
          * the callback function
          */
-        String (*callbackFunction)(String)
-
-        override;
+        String (*callbackFunction)(String) override;
 
 
         /*
@@ -115,7 +111,7 @@ namespace thing_esp {
 
 
         void publishMSG(const char *_msg) override {
-            client.publish(topic.c_str(), _msg);
+            client.publish(c_topic, _msg);
         }
 
         void callback(char *topic, byte *payload, unsigned int length) {

src/thingesp/Device.cpp

@@ -1,8 +1,12 @@
 #pragma once
+
 #include <Arduino.h>
 #include <stdint.h>
 #include <string.h>
+
 #include "../PubSubClient/PubSubClient.h"
+
+
 namespace thing_esp {
     class DeviceData {
     public:
@@ -23,6 +27,7 @@ namespace thing_esp {
         void genMetaData() {
             this->outName = projectName + "@" + username;
             this->topic = projectName + "/" + username;
+            this->c_topic = topic.c_str();
         }
 
         String projectName;
@@ -31,6 +36,7 @@ namespace thing_esp {
 
         String outName;
         String topic;
+        const char* c_topic;
 
         const char *ssid;
         const char *ssid_password;
@@ -41,10 +47,16 @@ namespace thing_esp {
         /*
          * Check if TLS Disabled or not
          */
-        #if  !defined(_DISABLE_TLS_) && !defined(ESP32)
-                unsigned int MQTT_PORT = 1899; // tls port
+        #if !defined(_MQTT_PORT_)
+
+            #if  !defined(_DISABLE_TLS_) && !defined(ESP32)
+                    unsigned int MQTT_PORT = 1899; // tls port
+            #else
+                    unsigned int MQTT_PORT = 1893; // non-tls port
+            #endif
+
         #else
-                unsigned int MQTT_PORT = 1893; // non-tls port
+            unsigned int MQTT_PORT = _MQTT_PORT_;
         #endif