Make logbuffer visible to Webgui, small fixes

4 years ago · 2042682d77
11 changed files with 441 additions and 1613 deletions
--- a/html/accesspoint_DE.html
+++ b/html/accesspoint_DE.html
--- a/html/management_DE.html
+++ b/html/management_DE.html
@ -136,6 +136,7 @@
    </a>
    <a class="reboot float-right nav-link" href="/restart"><i class="fas fa-redo"></i> Neustart</a>
    <a class="reboot float-right nav-link" href="/shutdown"><i class="fas fa-power-off"></i> Ausschalten</a>
+    <a class="reboot float-right nav-link" href="/log"><i class="fas fa-book"></i> Log</a>
    </div>
 </nav>
 <br/>
--- a/html/management_EN.html
+++ b/html/management_EN.html
@ -136,6 +136,7 @@
    </a>
    <a class="reboot float-right nav-link" href="/restart"><i class="fas fa-redo"></i> Restart</a>
    <a class="reboot float-right nav-link" href="/shutdown"><i class="fas fa-power-off"></i> Shutdown</a>
+    <a class="reboot float-right nav-link" href="/log"><i class="fas fa-book"></i> Log</a>
    </div>
 </nav>
 <br/>
--- a/processHtml.py
+++ b/processHtml.py
@ -18,7 +18,7 @@ def str2bool(v):
    else:
        raise argparse.ArgumentTypeError('Boolean value expected.')

-HTML_FILES = ["management","management_EN", "accesspoint", "accesspoint_EN"]
+HTML_FILES = ["management_DE","management_EN", "accesspoint_DE", "accesspoint_EN"]

 class htmlHeaderProcessor(object):

--- a/src/HTMLaccesspoint.h
+++ b/src/HTMLaccesspoint.h
@ -1,64 +0,0 @@
-static const char accesspoint_HTML[] PROGMEM = "<!DOCTYPE html>\
-<html>\
-    <head>\
-        <title>WLAN-Einrichtung</title>\
-        <style>\
-            input {\
-                width: 90%%;\
-                height: 44px;\
-                border-radius: 4px;\
-                margin: 10px auto;\
-                font-size: 15px;\
-                background: #f1f1f1;\
-                border: 0;\
-                padding: 0 15px\
-            }\
-            input {\
-\
-            }\
-            body {\
-                background: #007bff;\
-                font-family: sans-serif;\
-                font-size: 14px;\
-                color: #777\
-            }\
-            .box {\
-                background: #fff;\
-                max-width: 258px;\
-                margin: 75px auto;\
-                padding: 30px;\
-                border-radius: 5px;\
-                text-align: center\
-            }\
-            .btn {\
-                background: #3498db;\
-                color: #fff;\
-                cursor: pointer;\
-                width: 90%%;\
-                height: 44px;\
-                border-radius: 4px;\
-                margin: 10px auto;\
-                font-size: 15px;\
-            }\
-            .rebootmsg {\
-                display: none;\
-            }\
-        </style>\
-    </head>\
-    <body>\
-        <form id=\"settings\" action=\"/init\" class=\"box\" method=\"POST\">\
-            <h1>WLAN-Einrichtung</h1>\
-            <label for=\"ssid\">SSID:</label><br>\
-            <input type=\"text\" id=\"ssid\" name=\"ssid\" placeholder=\"SSID\" required><br>\
-            <label for=\"pwd\">Passwort:</label><br>\
-            <input type=\"password\" id=\"pwd\" name=\"pwd\" autocomplete=\"off\" required><br>\
-            <label for=\"hostname\">ESPuino-Name (Hostname):</label><br>\
-            <input type=\"text\" id=\"hostname\" name=\"hostname\" placeholder=\"espuino\" required><br><br>\
-            <input class=\"btn\" type=\"submit\" id=\"save-button\" value=\"Save\">\
-        </form>\
-        <form action=\"/restart\" class=\"box\">\
-            <h1>Fertig?</h1>\
-            <input class=\"btn\" type=\"submit\" id=\"restart-button\" value=\"Reboot\">\
-        </form>\
-    </body>\
-</html>";
--- a/src/HTMLmanagement.h
+++ b/src/HTMLmanagement.h
--- a/src/HTMLmanagement_DE.h
+++ b/src/HTMLmanagement_DE.h
@ -136,6 +136,7 @@ static const char management_HTML[] PROGMEM = "<!DOCTYPE html>\
    </a>\
    <a class=\"reboot float-right nav-link\" href=\"/restart\"><i class=\"fas fa-redo\"></i> Neustart</a>\
    <a class=\"reboot float-right nav-link\" href=\"/shutdown\"><i class=\"fas fa-power-off\"></i> Ausschalten</a>\
+    <a class=\"reboot float-right nav-link\" href=\"/log\"><i class=\"fas fa-book\"></i> Log</a>\
    </div>\
 </nav>\
 <br/>\
--- a/src/HTMLmanagement_EN.h
+++ b/src/HTMLmanagement_EN.h
@ -136,6 +136,7 @@ static const char management_HTML[] PROGMEM = "<!DOCTYPE html>\
    </a>\
    <a class=\"reboot float-right nav-link\" href=\"/restart\"><i class=\"fas fa-redo\"></i> Restart</a>\
    <a class=\"reboot float-right nav-link\" href=\"/shutdown\"><i class=\"fas fa-power-off\"></i> Shutdown</a>\
+    <a class=\"reboot float-right nav-link\" href=\"/log\"><i class=\"fas fa-book\"></i> Log</a>\
    </div>\
 </nav>\
 <br/>\
--- a/src/Log.cpp
+++ b/src/Log.cpp
@ -6,7 +6,7 @@

 // Serial-logging buffer
 uint8_t Log_BufferLength = 200;
-char *Log_Buffer = (char *) calloc(Log_BufferLength, sizeof(char)); // Buffer for all log-messages
+char *Log_Buffer;

 static LogRingBuffer Log_RingBuffer;

--- a/src/Web.cpp
+++ b/src/Web.cpp
@ -182,8 +182,7 @@ void webserverStart(void) {
 }

 // Used for substitution of some variables/templates of html-files. Is called by webserver's template-engine
-String templateProcessor(const String &templ)
-{
+String templateProcessor(const String &templ) {
    if (templ == "FTP_USER") {
        return gPrefsSettings.getString("ftpuser", "-1");
    } else if (templ == "FTP_PWD") {