From fcc2a48192a31f43e191b9ebe525ab7e3bb661eb Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Wed, 6 Sep 2023 08:05:45 +0200 Subject: [PATCH 1/3] Update to espressif32@6.4.0, v3.6.1-dev.1 --- CHANGELOG_LATEST.md | 1 + lib/framework/NetworkSettingsService.cpp | 8 ++++---- platformio.ini | 2 +- src/version.h | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md index 93542cc15..8239fa27f 100644 --- a/CHANGELOG_LATEST.md +++ b/CHANGELOG_LATEST.md @@ -18,3 +18,4 @@ - mqtt free mem check 60k - small cosmetic changes to Searching in Customization web page +- update to espressif32@6.4.0 diff --git a/lib/framework/NetworkSettingsService.cpp b/lib/framework/NetworkSettingsService.cpp index da89434b3..8dcee3bd8 100644 --- a/lib/framework/NetworkSettingsService.cpp +++ b/lib/framework/NetworkSettingsService.cpp @@ -6,6 +6,10 @@ NetworkSettingsService::NetworkSettingsService(AsyncWebServer * server, FS * fs, : _httpEndpoint(NetworkSettings::read, NetworkSettings::update, this, server, NETWORK_SETTINGS_SERVICE_PATH, securityManager) , _fsPersistence(NetworkSettings::read, NetworkSettings::update, this, fs, NETWORK_SETTINGS_FILE) , _lastConnectionAttempt(0) { + addUpdateHandler([&](const String & originId) { reconfigureWiFiConnection(); }, false); +} + +void NetworkSettingsService::begin() { // 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) { @@ -21,10 +25,6 @@ NetworkSettingsService::NetworkSettingsService(AsyncWebServer * server, FS * fs, WiFi.onEvent(std::bind(&NetworkSettingsService::WiFiEvent, this, _1)); - addUpdateHandler([&](const String & originId) { reconfigureWiFiConnection(); }, false); -} - -void NetworkSettingsService::begin() { _fsPersistence.readFromFS(); reconfigureWiFiConnection(); } diff --git a/platformio.ini b/platformio.ini index 18027e66a..bb4eab309 100644 --- a/platformio.ini +++ b/platformio.ini @@ -39,7 +39,7 @@ unbuild_flags = ${common.core_unbuild_flags} [espressi32_base] -platform = espressif32@6.3.2 +platform = espressif32 framework = arduino build_flags = ${common.build_flags} build_unflags = ${common.unbuild_flags} diff --git a/src/version.h b/src/version.h index 35cf2c9b9..d92033ee2 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define EMSESP_APP_VERSION "3.6.1-dev.0" +#define EMSESP_APP_VERSION "3.6.1-dev.1" From aa5730c68348a96071f360103e8d9b0709fb7239 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Wed, 6 Sep 2023 09:20:31 +0200 Subject: [PATCH 2/3] stay on platform 6.3.2 for esp32 until heap issue is solved --- platformio.ini | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/platformio.ini b/platformio.ini index bb4eab309..3ba1c8891 100644 --- a/platformio.ini +++ b/platformio.ini @@ -65,6 +65,8 @@ check_flags = ; the Web interface is built seperately [env:ci] extends = espressi32_base +; stay on platform 6.3.2 until heap issue is solved +platform = espressif32@6.3.2 extra_scripts = scripts/rename_fw.py board = esp32dev board_build.partitions = esp32_partition_4M.csv @@ -85,6 +87,8 @@ build_unflags = ${common.unbuild_flags} [env:esp32_4M] extends = espressi32_base +; stay on platform 6.3.2 until heap issue is solved +platform = espressif32@6.3.2 board = esp32dev board_upload.flash_size = 4MB board_build.partitions = esp32_partition_4M.csv @@ -92,6 +96,8 @@ build_flags = ${common.build_flags} -Os [env:esp32_4Mplus] extends = espressi32_base +; stay on platform 6.3.2 until heap issue is solved +platform = espressif32@6.3.2 board = esp32dev board_upload.flash_size = 4MB board_build.partitions = esp32_asym_partition_4M.csv @@ -99,6 +105,8 @@ build_flags = ${common.build_flags} [env:esp32_16M] extends = espressi32_base +; stay on platform 6.3.2 until heap issue is solved +platform = espressif32@6.3.2 board = esp32dev board_upload.flash_size = 16MB board_build.partitions = esp32_partition_16M.csv From 01f602477633126f3fe4242b263604cf4bd08e08 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Wed, 6 Sep 2023 10:33:58 +0200 Subject: [PATCH 3/3] color network antenna icon for wifi quality --- interface/src/framework/network/NetworkStatusForm.tsx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/interface/src/framework/network/NetworkStatusForm.tsx b/interface/src/framework/network/NetworkStatusForm.tsx index 6d4189327..9d94d2490 100644 --- a/interface/src/framework/network/NetworkStatusForm.tsx +++ b/interface/src/framework/network/NetworkStatusForm.tsx @@ -38,6 +38,15 @@ const networkStatusHighlight = ({ status }: NetworkStatus, theme: Theme) => { } }; +const networkQualityHighlight = ({ rssi }: NetworkStatus, theme: Theme) => { + if (rssi <= -85) { + return theme.palette.error.main; + } else if (rssi <= -75) { + return theme.palette.warning.main; + } + return theme.palette.success.main; +}; + export const isWiFi = ({ status }: NetworkStatus) => status === NetworkConnectionStatus.WIFI_STATUS_CONNECTED; export const isEthernet = ({ status }: NetworkStatus) => status === NetworkConnectionStatus.ETHERNET_STATUS_CONNECTED; @@ -110,7 +119,7 @@ const NetworkStatusForm: FC = () => { <> - +