From a6885be8ac8eca6665b1cfbf6e2d8934f4920098 Mon Sep 17 00:00:00 2001 From: Phaze-III Date: Mon, 1 Apr 2024 14:06:14 +0200 Subject: [PATCH] Revert "Go back to Arduino Core 2.7.4 release as a potential workaround for stalling OTA downloads" This reverts commit b2e4d26a23fc60958007c7fe44ccf62409c30725. --- airrohr-firmware/airrohr-firmware.ino | 6 ++---- airrohr-firmware/platformio.ini | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/airrohr-firmware/airrohr-firmware.ino b/airrohr-firmware/airrohr-firmware.ino index 3c55233f..230e0a1a 100644 --- a/airrohr-firmware/airrohr-firmware.ino +++ b/airrohr-firmware/airrohr-firmware.ino @@ -1703,8 +1703,7 @@ static void sendHttpRedirect() { default_ip_third_octet, default_ip_fourth_octet); - //String defaultAddress = F("http://") + defaultIP.toString() + F("/config"); - String defaultAddress = F("http://192.168.4.1/config"); + String defaultAddress = F("http://") + defaultIP.toString() + F("/config"); server.sendHeader(F("Location"), defaultAddress); server.send(302, FPSTR(TXT_CONTENT_TYPE_TEXT_HTML), emptyString); } @@ -3227,7 +3226,7 @@ static WiFiClient *getNewLoggerWiFiClient(const LoggerEntry logger) #if defined(ESP8266) static_cast(_client)->setSession(loggerConfigs[logger].session); static_cast(_client)->setBufferSizes(1024, TCP_MSS > 1024 ? 2048 : 1024); - //static_cast(_client)->setSSLVersion(BR_TLS12, BR_TLS12); + static_cast(_client)->setSSLVersion(BR_TLS12, BR_TLS12); switch (logger) { case Loggeraircms: @@ -6305,7 +6304,6 @@ void setup(void) esp_chipid += String((uint32_t)chipid_num, HEX); #endif cfg::initNonTrivials(esp_chipid.c_str()); - WiFi.persistent(false); debug_outln_info(F("airRohr: " SOFTWARE_VERSION_STR "/"), String(CURRENT_LANG)); diff --git a/airrohr-firmware/platformio.ini b/airrohr-firmware/platformio.ini index f17d273d..08473593 100644 --- a/airrohr-firmware/platformio.ini +++ b/airrohr-firmware/platformio.ini @@ -84,11 +84,11 @@ lib_deps_esp8266 = ${common.lib_deps_esp8266_platform} ${common.lib_deps_externa lib_deps_esp32 = ${common.lib_deps_esp32_platform} ${common.lib_deps_external} extra_scripts = platformio_script.py -# This release is reflecting the Arduino Core 2.7.4 release +# This release is reflecting the Arduino Core 3.0.1 release # When the requirement for Arduino Core is raised, this # needs to be adjusted to the matching version from # https://github.com/platformio/platform-espressif8266/releases -platform_version = espressif8266@2.6.2 +platform_version = espressif8266@3.1.0 platform_version_esp32 = espressif32@1.11.1 ; using Arduino core 1.0.4 [DISABLEDenv:lolin_d32_pro_debug]