Merge pull request #1284 from MichaelDvP/dev

fix for espressif@6.4.0

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

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 = () => {
             <>
               <ListItem>
                 <ListItemAvatar>
-                  <Avatar>
+                  <Avatar sx={{ bgcolor: networkQualityHighlight(data, theme) }}>
                     <SettingsInputAntennaIcon />
                   </Avatar>
                 </ListItemAvatar>

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();
 }

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}
@@ -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

src/version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.6.1-dev.0"
+#define EMSESP_APP_VERSION "3.6.1-dev.1"