From 9cb136a8e7d5d019e3cc0d6478e61ee3b7fe594a Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 27 Jul 2025 16:56:19 +0200 Subject: [PATCH] [Network] Disable ETH for ESP32-xx Display builds to make builds fit --- platformio_esp32c3_envs.ini | 2 +- platformio_esp32c6_envs.ini | 2 +- platformio_esp32s2_envs.ini | 2 +- platformio_esp32s3_envs.ini | 2 +- src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp | 2 +- src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp | 2 +- src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp | 2 +- src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp | 2 +- src/_C006.cpp | 2 +- src/_C013.cpp | 2 +- src/src/Commands/UDP.cpp | 2 +- src/src/CustomBuild/define_plugin_sets.h | 7 +++++++ src/src/ESPEasyCore/Controller.cpp | 2 +- src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp | 2 +- src/src/Helpers/{Network.cpp => NetworkStatusLED.cpp} | 6 +++++- src/src/Helpers/{Network.h => NetworkStatusLED.h} | 4 ---- src/src/Helpers/Networking.cpp | 2 +- src/src/Helpers/_CPlugin_Helper.cpp | 2 +- src/src/Helpers/_CPlugin_Helper.h | 2 +- src/src/WebServer/LoadFromFS.cpp | 2 +- 20 files changed, 29 insertions(+), 22 deletions(-) rename src/src/Helpers/{Network.cpp => NetworkStatusLED.cpp} (92%) rename src/src/Helpers/{Network.h => NetworkStatusLED.h} (62%) diff --git a/platformio_esp32c3_envs.ini b/platformio_esp32c3_envs.ini index 874ecd23d..acb48e0a2 100644 --- a/platformio_esp32c3_envs.ini +++ b/platformio_esp32c3_envs.ini @@ -77,7 +77,7 @@ build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32c3_4M316k_LittleFS_ETH] +[env:display_ESP32c3_4M316k_LittleFS] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_COLLECTION diff --git a/platformio_esp32c6_envs.ini b/platformio_esp32c6_envs.ini index 2ee850a0e..bcb552089 100644 --- a/platformio_esp32c6_envs.ini +++ b/platformio_esp32c6_envs.ini @@ -35,7 +35,7 @@ build_flags = ${esp32c6_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32c6_4M316k_LittleFS_ETH] +[env:display_ESP32c6_4M316k_LittleFS] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_COLLECTION diff --git a/platformio_esp32s2_envs.ini b/platformio_esp32s2_envs.ini index 98c9a46a8..72bf0ccb3 100644 --- a/platformio_esp32s2_envs.ini +++ b/platformio_esp32s2_envs.ini @@ -112,7 +112,7 @@ board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32s2_4M316k_LittleFS_ETH] +[env:display_ESP32s2_4M316k_LittleFS] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index 23c5f0cde..79b97c9db 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -103,7 +103,7 @@ board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32s3_4M316k_LittleFS_ETH] +[env:display_ESP32s3_4M316k_LittleFS] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp index 671c5696f..2d9e53abe 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp @@ -13,7 +13,7 @@ #include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" -#include "../../src/Helpers/Network.h" +#include "../../src/Helpers/NetworkStatusLED.h" #include "../../src/Helpers/Networking.h" #include "../../src/Helpers/StringConverter.h" #include "../../src/Helpers/MDNS_Helper.h" diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp index ddf27046a..1c6d93645 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp @@ -7,7 +7,7 @@ #include "../../src/Globals/ESPEasy_time.h" #include "../../src/Globals/Settings.h" -#include "../../src/Helpers/Network.h" +#include "../../src/Helpers/NetworkStatusLED.h" #include "../../src/Helpers/Networking.h" #include "../../src/Helpers/StringConverter.h" #include "../../src/Helpers/MDNS_Helper.h" diff --git a/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp b/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp index 4d3c0e14a..b0a0eaac7 100644 --- a/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp +++ b/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp @@ -18,7 +18,7 @@ # include "../../../src/Globals/Settings.h" # include "../../../src/Helpers/LongTermTimer.h" -# include "../../../src/Helpers/Network.h" +# include "../../../src/Helpers/NetworkStatusLED.h" # include "../../../src/Helpers/Networking.h" # include "../../../src/Helpers/PeriodicalActions.h" # include "../../../src/Helpers/StringConverter.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp index 6fc6b649f..4d6b14f21 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp @@ -21,7 +21,7 @@ # include "../../../src/Helpers/Convert.h" # include "../../../src/Helpers/ESPEasyRTC.h" # include "../../../src/Helpers/ESPEasy_Storage.h" -# include "../../../src/Helpers/Network.h" +# include "../../../src/Helpers/NetworkStatusLED.h" # include "../../../src/Helpers/Networking.h" # include "../../../src/Helpers/PeriodicalActions.h" # include "../../../src/Helpers/StringConverter.h" diff --git a/src/_C006.cpp b/src/_C006.cpp index ed248312c..2fa8617be 100644 --- a/src/_C006.cpp +++ b/src/_C006.cpp @@ -16,7 +16,7 @@ # include "src/ESPEasyCore/Controller.h" # include "src/Globals/Settings.h" # include "src/Helpers/_CPlugin_Helper_mqtt.h" -# include "src/Helpers/Network.h" +# include "src/Helpers/NetworkStatusLED.h" # include "src/Helpers/PeriodicalActions.h" # include "_Plugin_Helper.h" diff --git a/src/_C013.cpp b/src/_C013.cpp index 3e33bb2f8..c707e89a7 100644 --- a/src/_C013.cpp +++ b/src/_C013.cpp @@ -11,7 +11,7 @@ # include "src/DataStructs/C013_p2p_SensorInfoStruct.h" # include "src/ESPEasyCore/ESPEasyRules.h" # include "src/Helpers/Misc.h" -# include "src/Helpers/Network.h" +# include "src/Helpers/NetworkStatusLED.h" // ####################################################################################################### // ########################### Controller Plugin 013: ESPEasy P2P network ################################ diff --git a/src/src/Commands/UDP.cpp b/src/src/Commands/UDP.cpp index 432585d95..11159eae9 100644 --- a/src/src/Commands/UDP.cpp +++ b/src/src/Commands/UDP.cpp @@ -8,7 +8,7 @@ #include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Settings.h" #include "../Helpers/Misc.h" -#include "../Helpers/Network.h" +#include "../Helpers/NetworkStatusLED.h" #include "../Helpers/Networking.h" #include "../Helpers/StringConverter.h" #include "../Helpers/StringParser.h" diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 41ed5fc69..fb9deee88 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -159,6 +159,13 @@ To create/register a plugin, you have to : #endif #endif + +#if FEATURE_ETHERNET && defined(PLUGIN_DISPLAY_COLLECTION) + // Display builds are getting too large, so for now disable ETH for display buikds + #undef FEATURE_ETHERNET +#endif + + #ifdef MEMORY_ANALYSIS #ifdef MQTT_ONLY #define USES_C002 // Domoticz MQTT diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 2cfdf0246..d50e310c5 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -30,7 +30,7 @@ // #include "../Helpers/Memory.h" #include "../Helpers/Misc.h" -#include "../Helpers/Network.h" +#include "../Helpers/NetworkStatusLED.h" #include "../Helpers/PeriodicalActions.h" #include "../Helpers/PortStatus.h" diff --git a/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp b/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp index b6ff07688..365acd411 100644 --- a/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp +++ b/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp @@ -13,7 +13,7 @@ #include "../Helpers/Audio.h" #endif // if FEATURE_RTTTL && FEATURE_ANYRTTTL_LIB && FEATURE_ANYRTTTL_ASYNC #include "../Helpers/ESPEasy_time_calc.h" -#include "../Helpers/Network.h" +#include "../Helpers/NetworkStatusLED.h" #include "../Helpers/Networking.h" diff --git a/src/src/Helpers/Network.cpp b/src/src/Helpers/NetworkStatusLED.cpp similarity index 92% rename from src/src/Helpers/Network.cpp rename to src/src/Helpers/NetworkStatusLED.cpp index 365be211b..1db172a3c 100644 --- a/src/src/Helpers/Network.cpp +++ b/src/src/Helpers/NetworkStatusLED.cpp @@ -1,4 +1,4 @@ -#include "../Helpers/Network.h" +#include "../Helpers/NetworkStatusLED.h" #include "../../ESPEasy_common.h" @@ -19,6 +19,10 @@ # include #endif // ifdef ESP32 +#define PWMRANGE_FULL 1023 +#define STATUS_PWM_NORMALVALUE (PWMRANGE_FULL >> 2) +#define STATUS_PWM_NORMALFADE (PWMRANGE_FULL >> 8) +#define STATUS_PWM_TRAFFICRISE (PWMRANGE_FULL >> 1) /********************************************************************************************\ Status LED diff --git a/src/src/Helpers/Network.h b/src/src/Helpers/NetworkStatusLED.h similarity index 62% rename from src/src/Helpers/Network.h rename to src/src/Helpers/NetworkStatusLED.h index c2b859848..ad4edb5ce 100644 --- a/src/src/Helpers/Network.h +++ b/src/src/Helpers/NetworkStatusLED.h @@ -4,10 +4,6 @@ /********************************************************************************************\ Status LED \*********************************************************************************************/ -#define PWMRANGE_FULL 1023 -#define STATUS_PWM_NORMALVALUE (PWMRANGE_FULL >> 2) -#define STATUS_PWM_NORMALFADE (PWMRANGE_FULL >> 8) -#define STATUS_PWM_TRAFFICRISE (PWMRANGE_FULL >> 1) void statusLED(bool traffic); diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 64bfbcafd..2960533b6 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -28,7 +28,7 @@ #include "../Helpers/ESPEasy_time_calc.h" #include "../Helpers/Hardware.h" #include "../Helpers/Misc.h" -#include "../Helpers/Network.h" +#include "../Helpers/NetworkStatusLED.h" #include "../Helpers/Numerical.h" #include "../Helpers/StringConverter.h" #include "../Helpers/StringProvider.h" diff --git a/src/src/Helpers/_CPlugin_Helper.cpp b/src/src/Helpers/_CPlugin_Helper.cpp index 25a5f5425..34c42d0d9 100644 --- a/src/src/Helpers/_CPlugin_Helper.cpp +++ b/src/src/Helpers/_CPlugin_Helper.cpp @@ -23,7 +23,7 @@ #include "../Helpers/ESPEasy_time_calc.h" #include "../Helpers/Misc.h" -#include "../Helpers/Network.h" +#include "../Helpers/NetworkStatusLED.h" #include "../Helpers/Networking.h" #include "../Helpers/StringConverter.h" diff --git a/src/src/Helpers/_CPlugin_Helper.h b/src/src/Helpers/_CPlugin_Helper.h index 8d81aad71..28d9f018d 100644 --- a/src/src/Helpers/_CPlugin_Helper.h +++ b/src/src/Helpers/_CPlugin_Helper.h @@ -14,7 +14,7 @@ #include "../Globals/Services.h" #include "../Helpers/_CPlugin_init.h" #include "../Helpers/Misc.h" -#include "../Helpers/Network.h" +#include "../Helpers/NetworkStatusLED.h" #include "../Helpers/Networking.h" #include "../Helpers/Numerical.h" #include "../Helpers/StringConverter.h" diff --git a/src/src/WebServer/LoadFromFS.cpp b/src/src/WebServer/LoadFromFS.cpp index 0d815e99c..158ead854 100644 --- a/src/src/WebServer/LoadFromFS.cpp +++ b/src/src/WebServer/LoadFromFS.cpp @@ -6,7 +6,7 @@ #include "../Globals/RamTracker.h" #include "../Helpers/ESPEasy_Storage.h" -#include "../Helpers/Network.h" +#include "../Helpers/NetworkStatusLED.h" #include "../Helpers/Numerical.h" #include "../WebServer/CustomPage.h"