Merge 62446a9a30 into 2e5e5e59a8

gulpfile.js

@@ -48,10 +48,6 @@ let paths = {
     {
       src: 'src_data/images/*.*',
       dest: 'data/static/images/'
-    },
-    {
-      src: 'src_data/*.txt',
-      dest: 'data/static/'
     }
   ],
   pages: {

src/PortalTask.h

@@ -56,7 +56,6 @@ protected:
   bool webServerEnabled = false;
   bool dnsServerEnabled = false;
   unsigned long webServerChangeState = 0;
-  bool mDnsState = false;
 
   #if defined(ARDUINO_ARCH_ESP32)
   const char* getTaskName() override {
@@ -908,7 +907,6 @@ protected:
       }
     });
 
-    this->webServer->serveStatic("/robots.txt", LittleFS, "/static/robots.txt", PORTAL_CACHE);
     this->webServer->serveStatic("/favicon.ico", LittleFS, "/static/images/favicon.ico", PORTAL_CACHE);
     this->webServer->serveStatic("/static", LittleFS, "/static", PORTAL_CACHE);
   }
@@ -923,14 +921,8 @@ protected:
       this->startWebServer();
       Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("Started: AP up or STA connected"));
 
-      // Enabling mDNS
+      if (MDNS.begin(networkSettings.hostname)) {
-      if (!this->mDnsState && settings.portal.mdns) {
+        MDNS.addService("http", "tcp", 80);
-        if (MDNS.begin(networkSettings.hostname)) {
-          MDNS.addService("http", "tcp", 80);
-          this->mDnsState = true;
-
-          Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("mDNS enabled and service added"));
-        }
       }
 
       #ifdef ARDUINO_ARCH_ESP8266
@@ -941,27 +933,13 @@ protected:
       this->stopWebServer();
       Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("Stopped: AP and STA down"));
 
-      // Disabling mDNS
+      MDNS.end();
-      if (this->mDnsState) {
-        MDNS.end();
-        this->mDnsState = false;
-
-        Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("mDNS disabled"));
-      }
 
       #ifdef ARDUINO_ARCH_ESP8266
       ::optimistic_yield(1000);
       #endif
     }
 
-    // Disabling mDNS if disabled in settings
-    if (this->mDnsState && !settings.portal.mdns) {
-      MDNS.end();
-      this->mDnsState = false;
-
-      Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("mDNS disabled"));
-    }
-
     // dns server
     if (!this->stateDnsServer() && !network->isConnected() && network->isApEnabled() && this->stateWebServer()) {
       this->startDnsServer();

src/Settings.h

@@ -49,7 +49,6 @@ struct Settings {
     bool auth = false;
     char login[13] = DEFAULT_PORTAL_LOGIN;
     char password[33] = DEFAULT_PORTAL_PASSWORD;
-    bool mdns = true;
   } portal;
 
   struct {

src/strings.h

@@ -122,7 +122,6 @@ const char S_MAX_MODULATION[]                       PROGMEM = "maxModulation";
 const char S_MAX_POWER[]                            PROGMEM = "maxPower";
 const char S_MAX_TEMP[]                             PROGMEM = "maxTemp";
 const char S_MAX_TEMP_SYNC_WITH_TARGET_TEMP[]       PROGMEM = "maxTempSyncWithTargetTemp";
-const char S_MDNS[]                                 PROGMEM = "mdns";
 const char S_MEMBER_ID[]                            PROGMEM = "memberId";
 const char S_MESSAGE_ID[]                           PROGMEM = "messageId";
 const char S_MIN[]                                  PROGMEM = "min";

src/utils.h

@@ -440,7 +440,6 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
     portal[FPSTR(S_AUTH)] = src.portal.auth;
     portal[FPSTR(S_LOGIN)] = src.portal.login;
     portal[FPSTR(S_PASSWORD)] = src.portal.password;
-    portal[FPSTR(S_MDNS)] = src.portal.mdns;
 
     auto opentherm = dst[FPSTR(S_OPENTHERM)].to<JsonObject>();
     opentherm[FPSTR(S_UNIT_SYSTEM)] = static_cast<uint8_t>(src.opentherm.unitSystem);
@@ -708,15 +707,6 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       changed = true;
     }
 
-    if (src[FPSTR(S_PORTAL)][FPSTR(S_MDNS)].is<bool>()) {
-      bool value = src[FPSTR(S_PORTAL)][FPSTR(S_MDNS)].as<bool>();
-
-      if (value != dst.portal.mdns) {
-        dst.portal.mdns = value;
-        changed = true;
-      }
-    }
-
 
     // opentherm
     if (!src[FPSTR(S_OPENTHERM)][FPSTR(S_UNIT_SYSTEM)].isNull()) {

src_data/locales/en.json

@@ -297,8 +297,7 @@
       "portal": {
         "login": "Login",
         "password": "Password",
-        "auth": "Require authentication",
+        "auth": "Require authentication"
-        "mdns": "Use mDNS"
       },
 
       "system": {

src_data/locales/it.json

@@ -297,8 +297,7 @@
       "portal": {
         "login": "Login",
         "password": "Password",
-        "auth": "Richiede autenticazione",
+        "auth": "Richiede autenticazione"
-        "mdns": "Usa mDNS"
       },
 
       "system": {

src_data/locales/ru.json

@@ -297,8 +297,7 @@
       "portal": {
         "login": "Логин",
         "password": "Пароль",
-        "auth": "Требовать аутентификацию",
+        "auth": "Требовать аутентификацию"
-        "mdns": "Использовать mDNS"
       },
 
       "system": {

src_data/pages/settings.html

@@ -57,11 +57,6 @@
                 <input type="checkbox" name="portal[auth]" value="true">
                 <span data-i18n>settings.portal.auth</span>
               </label>
-
-              <label>
-                <input type="checkbox" name="portal[mdns]" value="true">
-                <span data-i18n>settings.portal.mdns</span>
-              </label>
               <br />
 
               <button type="submit" data-i18n>button.save</button>
@@ -778,7 +773,6 @@
           setCheckboxValue("[name='portal[auth]']", data.portal.auth);
           setInputValue("[name='portal[login]']", data.portal.login);
           setInputValue("[name='portal[password]']", data.portal.password);
-          setCheckboxValue("[name='portal[mdns]']", data.portal.mdns);
           setBusy('#portal-settings-busy', '#portal-settings', false);
 
           // Opentherm

src_data/robots.txt

@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /