Merge pull request #5308 from TD-er/feature/2025_april_RC1

[Build] 2025 April Release Candidate

Author: TD-er

docs/source/Reference/SystemVariable.rst

@@ -362,6 +362,9 @@ The conversion always outputs a string, but not all of these can be converted ba
    * - Secs to dhms: ``%c_s2dhms%(100000)``
      - Secs to dhms: ``1d03:46:40``
      - Seconds to days/hours/minutes/seconds notation
+   * - Random(L,H): ``%c_random%(0, 1)``
+     - Random(L,H): ``0.123``
+     - Generate random number in the given range L ... H (Added: 2025/04/29)
    * - To HEX: ``%c_2hex%(100000)``
      - To HEX: ``186A0``
      - Convert integer value to HEX notation.  (Added: 2020/10/07)

platformio_core_defs.ini

@@ -198,7 +198,7 @@ lib_extra_dirs            =
 ; ESP_IDF 5.3.1
 [core_esp32_IDF5_3_2__3_1_0_LittleFS]
 platform                    = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54
-platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3523/framework-arduinoespressif32-all-release_v5.4-2abf0b9a.zip
+platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3538/framework-arduinoespressif32-all-release_v5.4-8f5ad6d7.zip
 build_flags                 = -DESP32_STAGE
                               -DESP_IDF_VERSION_MAJOR=5
                               -DLIBRARIES_NO_LOG=1

platformio_esp32s3_envs.ini

@@ -60,6 +60,15 @@ board                     = esp32s3cdc-qio_qspi
 lib_ignore                = ${esp32s3_common.lib_ignore}
                             ${no_ir.lib_ignore}
 
+[env:normal_ESP32s3_4M316k_LittleFS_CDC_ETH]
+extends                   = esp32s3_common_LittleFS
+board                     = esp32s3cdc-qio_qspi
+lib_ignore                = ${esp32s3_common_LittleFS.lib_ignore}
+                            ${no_ir.lib_ignore}
+build_flags               = ${esp32s3_common_LittleFS.build_flags} 
+                            -DFEATURE_ARDUINO_OTA=1
+                            -DFEATURE_SD=1
+                            -DFEATURE_ETHERNET=1
 
 [env:collection_A_ESP32s3_4M316k_CDC]
 extends                   = esp32s3_common

src/src/Commands/GPIO.cpp

@@ -100,12 +100,13 @@ bool gpio_monitor_helper(int port, struct EventStruct *event, const char *Line)
     globalMapPortStatus[key].state = state;
 
     if (state == -1) { globalMapPortStatus[key].mode = PIN_MODE_OFFLINE; }
-
+    #ifndef BUILD_MINIMAL_OTA
     if (loglevelActiveFor(LOG_LEVEL_INFO)) {
       addLog(LOG_LEVEL_INFO, concat(
         logPrefix,
         strformat(F(" port #%d: added to monitor list."), port))); 
     }
+    #endif
     String dummy;
     SendStatusOnlyIfNeeded(event, SEARCH_PIN_STATE, key, dummy, 0);
 
@@ -147,11 +148,13 @@ bool gpio_unmonitor_helper(int port, struct EventStruct *event, const char *Line
     SendStatusOnlyIfNeeded(event, SEARCH_PIN_STATE, key, dummy, 0);
 
     removeMonitorFromPort(key);
+    #ifndef BUILD_MINIMAL_OTA
     if (loglevelActiveFor(LOG_LEVEL_INFO)) {
       addLog(LOG_LEVEL_INFO, concat(
         logPrefix,
         strformat(F(" port #%d: removed from monitor list."), port)));
     }
+    #endif
 
     return true;
   } else {
@@ -414,7 +417,9 @@ const __FlashStringHelper * Command_GPIO_RTTTL(struct EventStruct *event, const
     return return_command_success_flashstr();
   }
   #else // if FEATURE_RTTTL
+  #ifndef BUILD_MINIMAL_OTA
   addLog(LOG_LEVEL_ERROR, F("RTTTL: command not included in build"));
+  #endif
   #endif // if FEATURE_RTTTL
   return return_command_failed_flashstr();
 }

src/src/Commands/Servo.cpp

@@ -89,7 +89,9 @@ const __FlashStringHelper * Command_Servo(struct EventStruct *event, const char
     return return_command_success_flashstr();
   }
   #else // if FEATURE_SERVO
+  #ifndef BUILD_MINIMAL_OTA
   addLog(LOG_LEVEL_ERROR, F("SERVO : command not included in build"));
+  #endif
   #endif // FEATURE_SERVO
   return return_command_failed_flashstr();
 }

src/src/CustomBuild/define_plugin_sets.h

@@ -42,6 +42,9 @@ To create/register a plugin, you have to :
     #ifndef WEBSERVER_I2C_SCANNER
         #define WEBSERVER_I2C_SCANNER
     #endif
+    #ifndef WEBSERVER_CSVVAL
+      #define WEBSERVER_CSVVAL
+    #endif
     #ifndef WEBSERVER_FAVICON
         #define WEBSERVER_FAVICON
     #endif
@@ -511,7 +514,7 @@ To create/register a plugin, you have to :
         #define USES_P001   // switch
     #endif
     #ifndef USES_P026
-      #define USES_P026   // SysInfo
+//      #define USES_P026   // SysInfo
     #endif
     #ifndef USES_P033
       #define USES_P033   // Dummy
@@ -553,6 +556,12 @@ To create/register a plugin, you have to :
         #ifdef WEBSERVER_I2C_SCANNER
             #undef WEBSERVER_I2C_SCANNER
         #endif
+        #ifdef WEBSERVER_CSVVAL
+            #undef WEBSERVER_CSVVAL
+        #endif
+        #ifdef WEBSERVER_METRICS
+          #undef WEBSERVER_METRICS
+        #endif
         #ifdef WEBSERVER_FAVICON
             #undef WEBSERVER_FAVICON
         #endif

src/src/DataStructs/SecurityStruct.cpp

@@ -63,7 +63,9 @@ void SecurityStruct::clearWiFiCredentials() {
   ZERO_FILL(WifiKey);
   ZERO_FILL(WifiSSID2);
   ZERO_FILL(WifiKey2);
+  #ifndef BUILD_MINIMAL_OTA
   addLog(LOG_LEVEL_INFO, F("WiFi : Clear WiFi credentials from settings"));
+  #endif
 }
 
 void SecurityStruct::clearWiFiCredentials(SecurityStruct::WiFiCredentialsSlot slot) {

src/src/DataStructs/SystemTimerStruct.cpp

@@ -19,7 +19,9 @@ systemTimerStruct::systemTimerStruct(int recurringCount, unsigned long msecFromN
     // Create a new timer which should be "scheduled" now to clear up any data
     _recurringCount = 0; // Do not reschedule
     _loopCount      = 0; // Do not execute
+    #ifndef BUILD_MINIMAL_OTA
     addLog(LOG_LEVEL_INFO, F("TIMER: disable timer"));
+    #endif
   }
 
   if (hasAlternateInterval()) {

src/src/ESPEasyCore/Controller.cpp

@@ -179,7 +179,9 @@ bool MQTTConnect(controllerIndex_t controller_idx)
   MakeControllerSettings(ControllerSettings); // -V522
 
   if (!AllocatedControllerSettings()) {
+    #ifndef BUILD_MINIMAL_OTA
     addLog(LOG_LEVEL_ERROR, F("MQTT : Cannot connect, out of RAM"));
+    #endif
     return false;
   }
   LoadControllerSettings(controller_idx, *ControllerSettings);

src/src/ESPEasyCore/ESPEasyNetwork.cpp

@@ -69,7 +69,9 @@ void setNetworkMedium(NetworkMedium_t new_medium) {
   }
   statusLED(true);
   active_network_medium = new_medium;
+  #ifndef BUILD_MINIMAL_OTA
   addLog(LOG_LEVEL_INFO, concat(F("Set Network mode: "), toString(active_network_medium)));
+  #endif
 }