diff --git a/src/main.cpp b/src/main.cpp index 3e8e3b1..541710f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3147,6 +3147,8 @@ wl_status_t wifiManager(void) { return WiFi.status(); } +const char mqttTab[] PROGMEM = " MQTT"; +const char ftpTab[] PROGMEM = " FTP"; // Used for substitution of some variables/templates of html-files. Is called by webserver's template-engine String templateProcessor(const String& templ) { @@ -3158,6 +3160,12 @@ String templateProcessor(const String& templ) { return String(ftpUserLength-1); } else if (templ == "FTP_PWD_LENGTH") { return String(ftpPasswordLength-1); + } else if (templ == "SHOW_FTP_TAB") { // Only show FTP-tab if FTP-support was compiled + #ifdef FTP_ENABLE + return (String) FPSTR(ftpTab); + #else + return String(); + #endif } else if (templ == "INIT_LED_BRIGHTNESS") { return String(prefsSettings.getUChar("iLedBrightness", 0)); } else if (templ == "NIGHT_LED_BRIGHTNESS") { @@ -3180,6 +3188,12 @@ String templateProcessor(const String& templ) { return String(prefsSettings.getUInt("vCheckIntv", voltageCheckInterval)); } else if (templ == "MQTT_SERVER") { return prefsSettings.getString("mqttServer", "-1"); + } else if (templ == "SHOW_MQTT_TAB") { // Only show MQTT-tab if MQTT-support was compiled + #ifdef MQTT_ENABLE + return (String) FPSTR(mqttTab); + #else + return String(); + #endif } else if (templ == "MQTT_ENABLE") { if (enableMqtt) { return String("checked=\"checked\""); @@ -3598,14 +3612,14 @@ void webserverStart(void) { return true; } -// Conversion routine +// Conversion routine void convertAsciiToUtf8(String asciiString, char *utf8String) { int k=0; - + for (int i=0; i