diff --git a/firmware/data/config.html b/firmware/config_html.ino similarity index 98% rename from firmware/data/config.html rename to firmware/config_html.ino index ac695cd..2b84e0a 100644 --- a/firmware/data/config.html +++ b/firmware/config_html.ino @@ -1,4 +1,4 @@ - +const String config_html = R"=====(

Config

@@ -60,3 +60,4 @@
+)====="; diff --git a/firmware/firmware.ino b/firmware/firmware.ino index eff2f60..188c55a 100644 --- a/firmware/firmware.ino +++ b/firmware/firmware.ino @@ -1,3 +1,4 @@ + #include #include #include @@ -5,7 +6,6 @@ #include #include #include -#include "FS.h" #include "config.h" @@ -605,11 +605,7 @@ void init_webserver() } // Generate HTML page - String http_content = "123"; - // HTML-Datei öffnen und Inhalt in eine Zeichenfolge speichern - File file = SPIFFS.open("/index.html", "r"); - http_content = file.readString(); - file.close(); + String http_content = index_html; http_content.replace("{{LIGHT_NAME}}", (String)light_name); @@ -630,11 +626,7 @@ void init_webserver() http_content.replace("{{TRANSITION_TIME}}", (String)default_transitiontime); // Generate lights part of the HTML page - String light_content = ""; - // HTML-Datei öffnen und Inhalt in eine Zeichenfolge speichern - File file2 = SPIFFS.open("/light_control.html", "r"); - light_content = file2.readString(); - file2.close(); + String light_content = light_html; // Light control for (uint8 light_num = 0; light_num < LIGHTS_COUNT; light_num++) @@ -691,11 +683,7 @@ void init_webserver() } // Generate lights part of the HTML page - String config_content = ""; - // HTML-Datei öffnen und Inhalt in eine Zeichenfolge speichern - File file3 = SPIFFS.open("/config.html", "r"); - config_content = file3.readString(); - file3.close(); + String config_content = config_html; // Wifi settings config_content.replace("{{WIFI_SSIF}}", WiFi.SSID()); diff --git a/firmware/data/index.html b/firmware/index_html.ino similarity index 99% rename from firmware/data/index.html rename to firmware/index_html.ino index ad26aa0..b192eb3 100644 --- a/firmware/data/index.html +++ b/firmware/index_html.ino @@ -1,3 +1,4 @@ +const String index_html = R"=====( @@ -272,4 +273,4 @@ - +)====="; diff --git a/firmware/data/light_control.html b/firmware/light_control_html.ino similarity index 97% rename from firmware/data/light_control.html rename to firmware/light_control_html.ino index 87bd448..8c497f8 100644 --- a/firmware/data/light_control.html +++ b/firmware/light_control_html.ino @@ -1,3 +1,4 @@ +const String light_html = R"=====(

Light {{LIGHT_NUMBER}}

+)=====";