some formating, add variadic templ for logf()

include/ota.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __OTA_H
+#define __OTA_H
 
 #include <ArduinoOTA.h>
 #include <ESP8266WiFi.h>
@@ -46,3 +47,5 @@ void ota_setup() {
   ArduinoOTA.begin();
 
 }
+
+#endif // __OTA_H

lib/httpserver/filesys.cpp

@@ -2,7 +2,7 @@
 
 FSInfo fsinfo;
 
-bool mount_fs() {
+auto mount_fs() -> bool {
   if(!LittleFS.begin()) {
     Serial.println("[ERROR] LittleFS.info(), reset ...");
     return false;
@@ -25,7 +25,7 @@ bool mount_fs() {
   return true;
 }
 
-bool format_fs() {
+auto format_fs() -> bool {
   printf("Formatting FS ! \n\r");
   return LittleFS.format();
 }

lib/httpserver/httpserver.cpp

@@ -1,85 +1,79 @@
 #include "httpserver.h"
 
+auto HTTPServer::start() -> bool {
+  if (!mount_fs()) {
+    logf("cant mount filesystem, EXIT !\n\r");
+    return false;
+  }
 
-bool HTTPServer::start() {
+  logf("LittleFS mounted !\n\r");
-    if(!mount_fs()) {
+  logf("root:\n\r");
-        logf("cant mount filesystem, EXIT !\n\r");
+  this->listRoot();
-        return false;
+  logf("\n\r");
+
+  // default handler
+  this->onNotFound([this]() {
+    String message = "File Not Found\n\n";
+    message += "URI: ";
+    message += uri();
+    message += "\nMethod: ";
+    message += (method() == HTTP_GET) ? "GET" : "POST";
+    message += "\nArguments: ";
+    message += args();
+    message += "\n";
+
+    for (uint8_t i = 0; i < args(); i++) {
+      message += " " + argName(i) + ": " + arg(i) + "\n";
     }
-    logf("LittleFS mounted !\n\r");
+    send(404, "text/plain", message);
-    logf("root:\n\r");
+  });
-    this->listRoot();
-    logf("\n\r");
 
-    // default handler
+  // add static root file handler for http
-    this->onNotFound([this]() {
+  this->serveStatic("/", LittleFS, "/");
-        String message = "File Not Found\n\n";
+  this->begin();
-        message += "URI: ";
+  Serial.printf("Server active on Port 80 !\n\r");
-        message += uri();
+  return true;
-        message += "\nMethod: ";
-        message += (method() == HTTP_GET) ? "GET" : "POST";
-        message += "\nArguments: ";
-        message += args();
-        message += "\n";
-
-        for (uint8_t i = 0; i < args(); i++) {
-            message += " " + argName(i) + ": " + arg(i) + "\n";
-        }
-        send(404, "text/plain", message);
-    });
-
-    // add static root file handler for http
-    this->serveStatic("/", LittleFS, "/");
-    this->begin();
-    Serial.printf("Server active on Port 80 !\n\r");
-    return true;
-}
-
-void HTTPServer::logf(const char *format, ...) {
-    va_list args;
-    va_start(args, format);
-    char temp[64];
-    size_t len = vsnprintf(temp, sizeof(temp), format, args);
-    Serial.print(log_prefix);
-    Serial.write(temp, len);
-    va_end(args);
-}
-
-void HTTPServer::logt(const char *format, ...) {
-    va_list args;
-    va_start(args, format);
-    // append logging string to local buffer
-    if(tbuf_head < TBUF_LEN) {
-        size_t len = vsnprintf(tbuf+tbuf_head, TBUF_LEN-tbuf_head, format, args);
-        tbuf_head += len;
-    }
-    va_end(args);
 }
 
 void HTTPServer::start_apps() {
-    // application handler
+  // application handler
 
-    this->on("/update", HTTP_POST, [this]() {
+  this->on("/update", HTTP_POST, [this]() {
-        if(args()) {
+    if (args()) {
-            for(int i=0; i<args()-1; i++) {
+      for (int i = 0; i < args() - 1; i++) {
-                Serial.printf("%s=%s\n", argName(i).c_str(), arg(i).c_str());
+        Serial.printf("%s=%s\n", argName(i).c_str(), arg(i).c_str());
-                if(argName(i).equals("range_idl_pwm")) {
+        if (argName(i).equals("range_idl_pwm")) {
-                    treppe->set_idle_prozent(arg(i).toInt());
+          treppe->set_idle_prozent(arg(i).toInt());
-                }
-            }
         }
-        send(200, "text/plain", "accepted");
+      }
-    });
+    }
-
+    send(200, "text/plain", "accepted");
-    this->on("/terminal", HTTP_POST, [this]() {
+  });
-        // Serial.printf("got /terminal\n");
-        if(tbuf_head) {
-            send(200, "text/plain", tbuf);
-            tbuf_head = 0;
-        }
-        else {
-            send(202, "text/plain", "");
-        }
-    });
 
+  this->on("/terminal", HTTP_POST, [this]() {
+    // Serial.printf("got /terminal\n");
+    if (tbuf_head) {
+      send(200, "text/plain", tbuf);
+      tbuf_head = 0;
+    } else {
+      send(202, "text/plain", "");
+    }
+  });
+}
+
+template <class... Args>
+void HTTPServer::logf(const char *format, Args... args) const {
+  Serial.print(log_prefix);
+  Serial.printf(format, args...);
+}
+
+void HTTPServer::logt(const char *format, ...) {
+  va_list args;
+  va_start(args, format);
+  // append logging string to local buffer
+  if (tbuf_head < TBUF_LEN) {
+    tbuf_head +=
+        vsnprintf(tbuf + tbuf_head, TBUF_LEN - tbuf_head, format, args);
+  }
+  va_end(args);
 }

lib/httpserver/httpserver.h

@@ -2,45 +2,39 @@
 #define __HTTPSERVER_H
 // Wrapper for ESP8266WebServer with Filesystem as HTTP source
 
-#include <ESP8266WebServer.h>
-#include <stdarg.h>
 #include "filesys.h"
 #include "treppe.h"
+#include <ESP8266WebServer.h>
+#include <stdarg.h>
 
 // debug log <ESP8266WebServer.h>
 // #define DEBUGV(f,...) do { Serial.printf(PSTR(f), ##__VA_ARGS__); } while (0)
 
 #define TBUF_LEN 256
 
-
 class HTTPServer : public ESP8266WebServer {
 
 private:
-    const char* rootDir = "/";
+  const char *rootDir = "/";
-    const char* log_prefix = "[HTTPServer] ";
+  const char *log_prefix = "[HTTPServer] ";
 
-    size_t tbuf_head = 0;
+  size_t tbuf_head = 0;
-    char tbuf[TBUF_LEN];
+  char tbuf[TBUF_LEN];
 
-    void listRoot() {
+  void listRoot() { ls(rootDir); }
-        ls(rootDir);
+  Treppe *treppe;
-    }
-    Treppe* treppe;
 
 public:
-    HTTPServer(const int _port, const char* _rootDir, Treppe* _treppe) :
+  HTTPServer(const int _port, const char *_rootDir, Treppe *_treppe)
-       ESP8266WebServer(_port), rootDir(_rootDir), treppe(_treppe)
+      : ESP8266WebServer(_port), rootDir(_rootDir), treppe(_treppe) {}
-    { }
+  ~HTTPServer() { Serial.printf("[HTTPServer] shut down ...\n\r"); }
-    ~HTTPServer()
-    {
-        Serial.printf("[HTTPServer] shut down ...\n\r");
-    }
 
-    bool start();
+  bool start();
-    void start_apps();
+  void start_apps();
 
-    void logf(const char *format, ...);
+  template <class... Args> 
-    void logt(const char *format, ...);
+  void logf(const char *format, Args... args) const;
+  void logt(const char *format, ...);
 };
 
 #endif // __HTTPSERVER_H