Merge remote-tracking branch 'upstream/dev' into integration

esphome/components/ethernet/ethernet_component.h

@@ -11,11 +11,14 @@
 
 #include "esp_eth.h"
 #include "esp_eth_mac.h"
+#include "esp_eth_mac_esp.h"
 #include "esp_netif.h"
 #include "esp_mac.h"
 #include "esp_idf_version.h"
 
+#if CONFIG_ETH_USE_ESP32_EMAC
 extern "C" eth_esp32_emac_config_t eth_esp32_emac_default_config(void);
+#endif
 
 namespace esphome::ethernet {
 

esphome/components/ethernet/ethernet_helpers.c

@@ -3,6 +3,8 @@
 // ETH_ESP32_EMAC_DEFAULT_CONFIG() uses out-of-order designated initializers
 // which are valid in C but not in C++. This wrapper allows C++ code to get
 // the default config without replicating the macro's contents.
+#if CONFIG_ETH_USE_ESP32_EMAC
 eth_esp32_emac_config_t eth_esp32_emac_default_config(void) {
   return (eth_esp32_emac_config_t) ETH_ESP32_EMAC_DEFAULT_CONFIG();
 }
+#endif

esphome/const.py

@@ -1235,6 +1235,7 @@ UNIT_LITRE = "L"
 UNIT_LUX = "lx"
 UNIT_MEGAJOULE = "MJ"
 UNIT_METER = "m"
+UNIT_METER_PER_SECOND = "m/s"
 UNIT_METER_PER_SECOND_SQUARED = "m/s²"
 UNIT_MICROAMP = "µA"
 UNIT_MICROGRAMS_PER_CUBIC_METER = "µg/m³"
@@ -1244,6 +1245,7 @@ UNIT_MICROSILVERTS_PER_HOUR = "µSv/h"
 UNIT_MICROTESLA = "µT"
 UNIT_MILLIAMP = "mA"
 UNIT_MILLIGRAMS_PER_CUBIC_METER = "mg/m³"
+UNIT_MILLILITRE = "mL"
 UNIT_MILLIMETER = "mm"
 UNIT_MILLISECOND = "ms"
 UNIT_MILLISIEMENS_PER_CENTIMETER = "mS/cm"
@@ -1255,6 +1257,7 @@ UNIT_PARTS_PER_MILLION = "ppm"
 UNIT_PASCAL = "Pa"
 UNIT_PERCENT = "%"
 UNIT_PH = "pH"
+UNIT_POUND = "lb"
 UNIT_PULSES = "pulses"
 UNIT_PULSES_PER_MINUTE = "pulses/min"
 UNIT_REVOLUTIONS_PER_MINUTE = "RPM"

tests/components/ethernet/common-w5500.yaml

@@ -2,10 +2,10 @@ ethernet:
   type: W5500
   clk_pin: 19
   mosi_pin: 21
-  miso_pin: 23
+  miso_pin: 17
   cs_pin: 18
   interrupt_pin: 36
-  reset_pin: 22
+  reset_pin: 12
   clock_speed: 10Mhz
   manual_ip:
     static_ip: 192.168.178.56

tests/components/ethernet/test.esp32-s3-idf.yaml

@@ -0,0 +1 @@
+<<: !include common-w5500.yaml