From c341148009afff5048fa96dace2e36602e1fa04f Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Tue, 23 Mar 2021 22:19:57 +0100
Subject: [PATCH] minor cleanup

---
 lib/framework/OTASettingsService.cpp | 45 ++++++++++------------------
 lib/framework/OTASettingsService.h   |  9 ------
 2 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/lib/framework/OTASettingsService.cpp b/lib/framework/OTASettingsService.cpp
index 8d7bff722..ec10038eb 100644
--- a/lib/framework/OTASettingsService.cpp
+++ b/lib/framework/OTASettingsService.cpp
@@ -6,11 +6,7 @@ OTASettingsService::OTASettingsService(AsyncWebServer * server, FS * fs, Securit
     : _httpEndpoint(OTASettings::read, OTASettings::update, this, server, OTA_SETTINGS_SERVICE_PATH, securityManager)
     , _fsPersistence(OTASettings::read, OTASettings::update, this, fs, OTA_SETTINGS_FILE)
     , _arduinoOTA(nullptr) {
-#ifdef ESP32
     WiFi.onEvent(std::bind(&OTASettingsService::onStationModeGotIP, this, std::placeholders::_1, std::placeholders::_2), WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP);
-#elif defined(ESP8266)
-    _onStationModeGotIPHandler = WiFi.onStationModeGotIP(std::bind(&OTASettingsService::onStationModeGotIP, this, std::placeholders::_1));
-#endif
     addUpdateHandler([&](const String & originId) { configureArduinoOTA(); }, false);
 }
 
@@ -34,47 +30,38 @@ void OTASettingsService::configureArduinoOTA() {
         _arduinoOTA = nullptr;
     }
     if (_state.enabled) {
-        // Serial.println(F("Starting OTA Update Service..."));
         _arduinoOTA = new ArduinoOTAClass;
         _arduinoOTA->setPort(_state.port);
         _arduinoOTA->setPassword(_state.password.c_str());
 
         _arduinoOTA->onStart([]() {
-            // Serial.println(F("Starting"));
+            Serial.println(F("Starting"));
             emsesp::EMSESP::system_.upload_status(true);
         });
         _arduinoOTA->onEnd([]() {
-            // Serial.println(F("\r\nEnd"));
+            Serial.println(F("\r\nEnd"));
             emsesp::EMSESP::system_.upload_status(false);
         });
 
-        // _arduinoOTA->onProgress([](unsigned int progress, unsigned int total) {
-        //   Serial.printf_P(PSTR("Progress: %u%%\r\n"), (progress / (total / 100)));
-        // });
-        // _arduinoOTA->onError([](ota_error_t error) {
-        //   Serial.printf("Error[%u]: ", error);
-        //   if (error == OTA_AUTH_ERROR)
-        //     Serial.println(F("Auth Failed"));
-        //   else if (error == OTA_BEGIN_ERROR)
-        //     Serial.println(F("Begin Failed"));
-        //   else if (error == OTA_CONNECT_ERROR)
-        //     Serial.println(F("Connect Failed"));
-        //   else if (error == OTA_RECEIVE_ERROR)
-        //     Serial.println(F("Receive Failed"));
-        //   else if (error == OTA_END_ERROR)
-        //     Serial.println(F("End Failed"));
-        // });
+        _arduinoOTA->onProgress([](unsigned int progress, unsigned int total) { Serial.printf_P(PSTR("Progress: %u%%\r\n"), (progress / (total / 100))); });
+        _arduinoOTA->onError([](ota_error_t error) {
+            Serial.printf("Error[%u]: ", error);
+            if (error == OTA_AUTH_ERROR)
+                Serial.println(F("Auth Failed"));
+            else if (error == OTA_BEGIN_ERROR)
+                Serial.println(F("Begin Failed"));
+            else if (error == OTA_CONNECT_ERROR)
+                Serial.println(F("Connect Failed"));
+            else if (error == OTA_RECEIVE_ERROR)
+                Serial.println(F("Receive Failed"));
+            else if (error == OTA_END_ERROR)
+                Serial.println(F("End Failed"));
+        });
 
         _arduinoOTA->begin();
     }
 }
 
-#ifdef ESP32
 void OTASettingsService::onStationModeGotIP(WiFiEvent_t event, WiFiEventInfo_t info) {
     configureArduinoOTA();
 }
-#elif defined(ESP8266)
-void OTASettingsService::onStationModeGotIP(const WiFiEventStationModeGotIP & event) {
-    configureArduinoOTA();
-}
-#endif
diff --git a/lib/framework/OTASettingsService.h b/lib/framework/OTASettingsService.h
index 38b3b3a98..f18b4dea0 100644
--- a/lib/framework/OTASettingsService.h
+++ b/lib/framework/OTASettingsService.h
@@ -4,11 +4,7 @@
 #include <HttpEndpoint.h>
 #include <FSPersistence.h>
 
-#ifdef ESP32
 #include <ESPmDNS.h>
-#elif defined(ESP8266)
-#include <ESP8266mDNS.h>
-#endif
 
 #include <ArduinoOTA.h>
 #include <WiFiUdp.h>
@@ -61,12 +57,7 @@ class OTASettingsService : public StatefulService<OTASettings> {
     ArduinoOTAClass *          _arduinoOTA;
 
     void configureArduinoOTA();
-#ifdef ESP32
     void onStationModeGotIP(WiFiEvent_t event, WiFiEventInfo_t info);
-#elif defined(ESP8266)
-    WiFiEventHandler _onStationModeGotIPHandler;
-    void             onStationModeGotIP(const WiFiEventStationModeGotIP & event);
-#endif
 };
 
 #endif // end OTASettingsService_h