Merge branch 'release/v3.1.x' into matter_temp_light

Author: SuGlider

cores/esp32/esp32-hal-cpu.c

@@ -259,6 +259,7 @@ bool setCpuFrequencyMhz(uint32_t cpu_freq_mhz) {
   if (apb_change_callbacks) {
     triggerApbChangeCallback(APB_AFTER_CHANGE, capb, apb);
   }
+  // clang-format off
 #ifdef SOC_CLK_APLL_SUPPORTED
   log_d(
     "%s: %u / %u = %u Mhz, APB: %u Hz",
@@ -268,7 +269,7 @@ bool setCpuFrequencyMhz(uint32_t cpu_freq_mhz) {
 #ifdef CONFIG_IDF_TARGET_ESP32P4
                                           : "17.5M"),
 #else
-                                                                                                                           : "8M")),
+                                          : "8M")),
 #endif
     conf.source_freq_mhz, conf.div, conf.freq_mhz, apb
   );
@@ -278,6 +279,7 @@ bool setCpuFrequencyMhz(uint32_t cpu_freq_mhz) {
     conf.source_freq_mhz, conf.div, conf.freq_mhz, apb
   );
 #endif
+  // clang-format on
   return true;
 }
 

libraries/ESP32/keywords.txt

@@ -6,6 +6,8 @@
 # Datatypes (KEYWORD1)
 #######################################
 
+Serial4  KEYWORD1
+
 #######################################
 # Methods and Functions (KEYWORD2)
 #######################################

libraries/Ethernet/src/ETH.cpp

@@ -22,6 +22,7 @@
 #define ARDUINO_CORE_BUILD
 
 #include "ETH.h"
+#if CONFIG_ETH_ENABLED
 #include "esp_system.h"
 #include "esp_event.h"
 #include "esp_eth.h"
@@ -1056,3 +1057,5 @@ size_t ETHClass::printDriverInfo(Print &out) const {
 }
 
 ETHClass ETH;
+
+#endif /* CONFIG_ETH_ENABLED */

libraries/Ethernet/src/ETH.h

@@ -18,6 +18,9 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "sdkconfig.h"
+#if CONFIG_ETH_ENABLED
+
 #ifndef _ETH_H_
 #define _ETH_H_
 
@@ -249,3 +252,4 @@ class ETHClass : public NetworkInterface {
 extern ETHClass ETH;
 
 #endif /* _ETH_H_ */
+#endif /* CONFIG_ETH_ENABLED */

libraries/Network/src/NetworkEvents.h

@@ -5,18 +5,20 @@
  */
 #pragma once
 
+#include "sdkconfig.h"
 #include "soc/soc_caps.h"
 #include "esp_err.h"
 #include "esp_event.h"
 #include "esp_netif_types.h"
+#if CONFIG_ETH_ENABLED
 #include "esp_eth_driver.h"
+#endif
 #include <functional>
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/queue.h"
 #include "freertos/semphr.h"
 #include "freertos/event_groups.h"
-#include "sdkconfig.h"
 #if defined NETWORK_EVENTS_MUTEX && SOC_CPU_CORES_NUM > 1
 #include <mutex>
 #endif  // defined NETWORK_EVENTS_MUTEX &&  SOC_CPU_CORES_NUM > 1
@@ -98,7 +100,9 @@ typedef union {
   ip_event_ap_staipassigned_t wifi_ap_staipassigned;
   ip_event_got_ip_t got_ip;
   ip_event_got_ip6_t got_ip6;
+#if CONFIG_ETH_ENABLED
   esp_eth_handle_t eth_connected;
+#endif
 #if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED
   wifi_event_sta_scan_done_t wifi_scan_done;
   wifi_event_sta_authmode_change_t wifi_sta_authmode_change;

libraries/WiFi/src/WiFiGeneric.h

@@ -33,7 +33,9 @@
 #include "IPAddress.h"
 #include "esp_smartconfig.h"
 #include "esp_netif_types.h"
+#if CONFIG_ETH_ENABLED
 #include "esp_eth_driver.h"
+#endif
 #if CONFIG_NETWORK_PROV_NETWORK_TYPE_WIFI
 #include "network_provisioning/manager.h"
 #endif