Fix identation

Author: Bjarne Loft

src/ConfigEntry.cpp

@@ -38,13 +38,13 @@ void ConfigEntry::save() {
   File f = SPIFFS.open("/config.cfg", "w");
   if (f) {
     each([&](Entry* entry) {
-        if(entry->getTopic() != getTopic()) {
-        f.print(getKey(entry));
-        f.print("=");
-        f.println(entry->getValue());
-        debug(getKey(entry), entry->getValue());
-        }
-        });
+      if(entry->getTopic() != getTopic()) {
+      f.print(getKey(entry));
+      f.print("=");
+      f.println(entry->getValue());
+      debug(getKey(entry), entry->getValue());
+      }
+    });
     f.close();
   } else {
     debug("Failed to save config");

src/EasyMqtt.cpp

@@ -9,7 +9,7 @@
 
 
 /**
-  Handle connections to mqtt
+  * Handle connections to mqtt
   */
 void EasyMqtt::connectWiFi() {
   if(WiFi.status() != WL_CONNECTED) {
@@ -59,29 +59,29 @@ void EasyMqtt::connectMqtt() {
     debug("Connecting to MQTT");
     mqttClient.setClient(wifiClient);
     mqttClient.setCallback([&](const char* topic, uint8_t* payload, unsigned int length) {
-        each([=](Entry* entry){
-            entry->callback(topic, payload, length);
-            });
-        });
+      each([=](Entry* entry){
+        entry->callback(topic, payload, length);
+      });
+    });
 
     mqttClient.setServer(mqtt_host, mqtt_port);
 
     if (mqttClient.connect(deviceId.c_str(), mqtt_username, mqtt_password), get("$system")["online"].getTopic().c_str(), 1, 1, "OFF") {
       debug("Connected to MQTT");
 
       setPublishFunction([&](Entry* entry, String message){
-          if(mqttClient.connected()) {
-          mqttClient.publish(entry->getTopic().c_str(), message.c_str(), true);
-          }
-          });
+        if(mqttClient.connected()) {
+        mqttClient.publish(entry->getTopic().c_str(), message.c_str(), true);
+        }
+      });
 
       debug("Topic", getTopic()); 
 
       each([&](Entry* entry){
-          if (entry->isOut()) {
+        if (entry->isOut()) {
           mqttClient.subscribe(entry->getTopic().c_str());
-          }
-          });
+        }
+      });
       mqttDelay = 0;
     } else {
       debug("Connection to MQTT failed, rc", mqttClient.state());
@@ -224,7 +224,7 @@ void EasyMqtt::loop() {
     }
     webPortal.loop();
     each([](Entry* entry){
-        entry->update();
-        });
+      entry->update();
+    });
   }
 }

src/Entry.cpp

@@ -56,22 +56,27 @@ void Entry::setPublishFunction(std::function<void(Entry*, String)> function) {
 }
 
 void Entry::debug(String key, bool value) {
+#ifdef DEBUG
   debug(key + " = " + (value ? "true" : "false"));
+#endif
 }
 
 void Entry::debug(String key, int value) {
+#ifdef DEBUG
   debug(key + " = " + value);
+#endif
 }
 
 void Entry::debug(String key, String value) {
+#ifdef DEBUG
   debug(key + " = " + value);
+#endif
 }
 
 void Entry::debug(String msg) {
 #ifdef DEBUG
   Serial.println(msg);
 #endif
-  getRoot()->get("$system")["debug"].publish(msg);
 }
 
 void Entry::callback(const char* topic, uint8_t* payload, unsigned int length) {

src/WebPortal.cpp

@@ -27,16 +27,16 @@ void WebPortal::setup(Entry& mqttEntry, ConfigEntry& config, NTPClient& ntpClien
   webServer->on("/", std::bind(&WebPortal::handleRoot, this));
   webServer->on("/save", std::bind(&WebPortal::handleSaveConfig, this));
   mqtt->each([&](Entry* entry) {
-      if(entry->isIn() || entry->isOut()) {
+    if(entry->isIn() || entry->isOut()) {
       webServer->on(getRestPath(entry).c_str(), std::bind(&WebPortal::handleRest, this));
-      }
-      });
+    }
+  });
   webServer->onNotFound(std::bind(&WebPortal::handleNotFound, this));
   webServer->begin();
 }
 
 void WebPortal::handleRoot() {
- if(!auth()) return;
+  if(!auth()) return;
   webServer->send(200, "text/html", "");
 
   webServer->sendContent_P(HTML_MAIN1);
@@ -147,14 +147,14 @@ void WebPortal::handleRest() {
 void WebPortal::handleSaveConfig() {
   if(!auth()) return;
   config->each([&](Entry* entry) {
-      String name = getName(entry);
-      name = name.substring(9);
-      name.replace("/", ".");
-      entry->setValue(webServer->arg(name.c_str()));
-      Serial.print(name);
-      Serial.print(" = ");
-      Serial.println(webServer->arg(name.c_str()));
-      });
+    String name = getName(entry);
+    name = name.substring(9);
+    name.replace("/", ".");
+    entry->setValue(webServer->arg(name.c_str()));
+    Serial.print(name);
+    Serial.print(" = ");
+    Serial.println(webServer->arg(name.c_str()));
+  });
   config->save();
   webServer->sendHeader("Location", String("/"), true);
   webServer->send(302, "text/plain", "");
@@ -191,11 +191,11 @@ String WebPortal::time(long time) {
 }
 
 bool WebPortal::auth() {
-    char pass[32];
-    config->getCString("password", "", pass);
-    if (strlen(pass) > 0 && !webServer->authenticate("admin", pass)) {
-        webServer->requestAuthentication();
-        return false;
-    }
-    return true;
+  char pass[32];
+  config->getCString("password", "", pass);
+  if (strlen(pass) > 0 && !webServer->authenticate("admin", pass)) {
+    webServer->requestAuthentication();
+    return false;
+  }
+  return true;
 }