Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2

README.md

@@ -179,7 +179,7 @@ The Web is based off Rick's awesome [esp8266-react](https://github.com/rjwats/es
   * `MqttStatus.cpp` added root["mqtt_fails"]
   * `SecuritySettingsService.cpp` added version to the JWT payload
   * `SecuritySettingsService.h` #include "../../src/version.h"
-  * `WiFiSettingsService.cpp` added WiFi.setOutputPower(20.0f) - removed
+  * `WiFiSettingsService.cpp` added WiFi.setOutputPower(20.0f), moved setHostname
   * `OTASettingsService.h` added #include "../../src/system.h" 
   * `OTASettingsService.cpp` added call to emsesp::System::upload_status(true)
   * `features.ini`: -D FT_NTP=0

lib/framework/WiFiSettingsService.cpp

@@ -1,9 +1,9 @@
 #include <WiFiSettingsService.h>
 
-WiFiSettingsService::WiFiSettingsService(AsyncWebServer* server, FS* fs, SecurityManager* securityManager) :
-    _httpEndpoint(WiFiSettings::read, WiFiSettings::update, this, server, WIFI_SETTINGS_SERVICE_PATH, securityManager),
-    _fsPersistence(WiFiSettings::read, WiFiSettings::update, this, fs, WIFI_SETTINGS_FILE),
-    _lastConnectionAttempt(0) {
+WiFiSettingsService::WiFiSettingsService(AsyncWebServer * server, FS * fs, SecurityManager * securityManager)
+    : _httpEndpoint(WiFiSettings::read, WiFiSettings::update, this, server, WIFI_SETTINGS_SERVICE_PATH, securityManager)
+    , _fsPersistence(WiFiSettings::read, WiFiSettings::update, this, fs, WIFI_SETTINGS_FILE)
+    , _lastConnectionAttempt(0) {
     // We want the device to come up in opmode=0 (WIFI_OFF), when erasing the flash this is not the default.
     // If needed, we save opmode=0 before disabling persistence so the device boots with WiFi disabled in the future.
     if (WiFi.getMode() != WIFI_OFF) {
@@ -17,11 +17,9 @@ WiFiSettingsService::WiFiSettingsService(AsyncWebServer* server, FS* fs, Securit
     // Init the wifi driver on ESP32
     WiFi.mode(WIFI_MODE_MAX);
     WiFi.mode(WIFI_MODE_NULL);
-  WiFi.onEvent(
-      std::bind(&WiFiSettingsService::onStationModeDisconnected, this, std::placeholders::_1, std::placeholders::_2),
+    WiFi.onEvent(std::bind(&WiFiSettingsService::onStationModeDisconnected, this, std::placeholders::_1, std::placeholders::_2),
                  WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);
-  WiFi.onEvent(std::bind(&WiFiSettingsService::onStationModeStop, this, std::placeholders::_1, std::placeholders::_2),
-               WiFiEvent_t::SYSTEM_EVENT_STA_STOP);
+    WiFi.onEvent(std::bind(&WiFiSettingsService::onStationModeStop, this, std::placeholders::_1, std::placeholders::_2), WiFiEvent_t::SYSTEM_EVENT_STA_STOP);
 #elif defined(ESP8266)
 
     // proddy added
@@ -31,8 +29,7 @@ WiFiSettingsService::WiFiSettingsService(AsyncWebServer* server, FS* fs, Securit
     // high tx power causing weird behavior, slightly lowering from 20.5 to 20.0 may help stability
     // WiFi.setOutputPower(20.0f); // in dBm
 
-  _onStationModeDisconnectedHandler = WiFi.onStationModeDisconnected(
-      std::bind(&WiFiSettingsService::onStationModeDisconnected, this, std::placeholders::_1));
+    _onStationModeDisconnectedHandler = WiFi.onStationModeDisconnected(std::bind(&WiFiSettingsService::onStationModeDisconnected, this, std::placeholders::_1));
 #endif
 
     addUpdateHandler([&](const String & originId) { reconfigureWiFiConnection(); }, false);
@@ -80,12 +77,16 @@ void WiFiSettingsService::manageSTA() {
            // configure for DHCP
 #ifdef ESP32
             WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE);
-      WiFi.setHostname(_state.hostname.c_str());
 #elif defined(ESP8266)
             WiFi.config(INADDR_ANY, INADDR_ANY, INADDR_ANY);
-      WiFi.hostname(_state.hostname);
 #endif
         }
+        // set hostname
+#ifdef ESP32
+        WiFi.setHostname(_state.hostname.c_str());
+#elif defined(ESP8266)
+        WiFi.hostname(_state.hostname);
+#endif
         // attempt to connect to the network
         WiFi.begin(_state.ssid.c_str(), _state.password.c_str());
     }

media/EMS-ESP_logo.png:Zone.Identifier

@@ -1,3 +0,0 @@
-[ZoneTransfer]
-LastWriterPackageFamilyName=Microsoft.MSPaint_8wekyb3d8bbwe
-ZoneId=3

media/EMS-ESP_logo_dark.png:Zone.Identifier

@@ -1,3 +0,0 @@
-[ZoneTransfer]
-LastWriterPackageFamilyName=Microsoft.MSPaint_8wekyb3d8bbwe
-ZoneId=3