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

2025-08-09 11:57:46 +00:00 · 2025-06-27 06:30:15 -05:00 · 2025-06-27 06:30:15 -05:00 · ce0f1dfcb6
commit ce0f1dfcb6
parent 9a3a5d48eb c0b1f32889
11 changed files with 33 additions and 53 deletions
--- a/esphome/components/audio/audio_decoder.cpp
+++ b/esphome/components/audio/audio_decoder.cpp
@ -312,7 +312,7 @@ FileDecoderState AudioDecoder::decode_mp3_() {
  if (err) {
    switch (err) {
      case esp_audio_libs::helix_decoder::ERR_MP3_OUT_OF_MEMORY:
-        // Intentional fallthrough
+        [[fallthrough]];
      case esp_audio_libs::helix_decoder::ERR_MP3_NULL_POINTER:
        return FileDecoderState::FAILED;
        break;
--- a/esphome/components/esp32/init.py
+++ b/esphome/components/esp32/init.py
@ -610,7 +610,7 @@ ESP_IDF_FRAMEWORK_SCHEMA = cv.All(
                        CONF_ENABLE_LWIP_DHCP_SERVER, "wifi", default=False
                    ): cv.boolean,
                    cv.Optional(
-                        CONF_ENABLE_LWIP_MDNS_QUERIES, default=False
+                        CONF_ENABLE_LWIP_MDNS_QUERIES, default=True
                    ): cv.boolean,
                    cv.Optional(
                        CONF_ENABLE_LWIP_BRIDGE_INTERFACE, default=False
@ -773,7 +773,7 @@ async def to_code(config):
            and not advanced[CONF_ENABLE_LWIP_DHCP_SERVER]
        ):
            add_idf_sdkconfig_option("CONFIG_LWIP_DHCPS", False)
-        if not advanced.get(CONF_ENABLE_LWIP_MDNS_QUERIES, False):
+        if not advanced.get(CONF_ENABLE_LWIP_MDNS_QUERIES, True):
            add_idf_sdkconfig_option("CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES", False)
        if not advanced.get(CONF_ENABLE_LWIP_BRIDGE_INTERFACE, False):
            add_idf_sdkconfig_option("CONFIG_LWIP_BRIDGEIF_MAX_PORTS", 0)
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@ -496,17 +496,17 @@ float BLEClientBase::parse_char_value(uint8_t *value, uint16_t length) {
      if (length > 2) {
        return (float) encode_uint16(value[1], value[2]);
      }
-      // fall through
+      [[fallthrough]];
    case 0x7:  // uint24.
      if (length > 3) {
        return (float) encode_uint24(value[1], value[2], value[3]);
      }
-      // fall through
+      [[fallthrough]];
    case 0x8:  // uint32.
      if (length > 4) {
        return (float) encode_uint32(value[1], value[2], value[3], value[4]);
      }
-      // fall through
+      [[fallthrough]];
    case 0xC:  // int8.
      return (float) ((int8_t) value[1]);
    case 0xD:  // int12.
@ -514,12 +514,12 @@ float BLEClientBase::parse_char_value(uint8_t *value, uint16_t length) {
      if (length > 2) {
        return (float) ((int16_t) (value[1] << 8) + (int16_t) value[2]);
      }
-      // fall through
+      [[fallthrough]];
    case 0xF:  // int24.
      if (length > 3) {
        return (float) ((int32_t) (value[1] << 16) + (int32_t) (value[2] << 8) + (int32_t) (value[3]));
      }
-      // fall through
+      [[fallthrough]];
    case 0x10:  // int32.
      if (length > 4) {
        return (float) ((int32_t) (value[1] << 24) + (int32_t) (value[2] << 16) + (int32_t) (value[3] << 8) +
--- a/esphome/components/esp32_camera/init.py
+++ b/esphome/components/esp32_camera/init.py
@ -310,11 +310,7 @@ async def to_code(config):
    cg.add_define("USE_ESP32_CAMERA")

    if CORE.using_esp_idf:
-        add_idf_component(
-            name="esp32-camera",
-            repo="https://github.com/espressif/esp32-camera.git",
-            ref="v2.0.15",
-        )
+        add_idf_component(name="espressif/esp32-camera", ref="2.0.15")

    for conf in config.get(CONF_ON_STREAM_START, []):
        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
--- a/esphome/components/mdns/init.py
+++ b/esphome/components/mdns/init.py
@ -88,12 +88,7 @@ async def to_code(config):
    if CORE.using_esp_idf and CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] >= cv.Version(
        5, 0, 0
    ):
-        add_idf_component(
-            name="mdns",
-            repo="https://github.com/espressif/esp-protocols.git",
-            ref="mdns-v1.8.2",
-            path="components/mdns",
-        )
+        add_idf_component(name="espressif/mdns", ref="1.8.2")

    cg.add_define("USE_MDNS")

--- a/esphome/components/micro_wake_word/init.py
+++ b/esphome/components/micro_wake_word/init.py
@ -449,11 +449,7 @@ async def to_code(config):
    cg.add_define("USE_MICRO_WAKE_WORD")
    cg.add_define("USE_OTA_STATE_CALLBACK")

-    esp32.add_idf_component(
-        name="esp-tflite-micro",
-        repo="https://github.com/espressif/esp-tflite-micro",
-        ref="v1.3.3.1",
-    )
+    esp32.add_idf_component(name="espressif/esp-tflite-micro", ref="1.3.3~1")

    cg.add_build_flag("-DTF_LITE_STATIC_MEMORY")
    cg.add_build_flag("-DTF_LITE_DISABLE_X86_NEON")
--- a/esphome/components/pn7150/pn7150.cpp
+++ b/esphome/components/pn7150/pn7150.cpp
@ -584,7 +584,7 @@ void PN7150::nci_fsm_transition_() {
      } else {
        this->nci_fsm_set_state_(NCIState::NFCC_INIT);
      }
-      // fall through
+      [[fallthrough]];

    case NCIState::NFCC_INIT:
      if (this->init_core_() != nfc::STATUS_OK) {
@ -594,7 +594,7 @@ void PN7150::nci_fsm_transition_() {
      } else {
        this->nci_fsm_set_state_(NCIState::NFCC_CONFIG);
      }
-      // fall through
+      [[fallthrough]];

    case NCIState::NFCC_CONFIG:
      if (this->send_init_config_() != nfc::STATUS_OK) {
@ -605,7 +605,7 @@ void PN7150::nci_fsm_transition_() {
        this->config_refresh_pending_ = false;
        this->nci_fsm_set_state_(NCIState::NFCC_SET_DISCOVER_MAP);
      }
-      // fall through
+      [[fallthrough]];

    case NCIState::NFCC_SET_DISCOVER_MAP:
      if (this->set_discover_map_() != nfc::STATUS_OK) {
@ -615,7 +615,7 @@ void PN7150::nci_fsm_transition_() {
      } else {
        this->nci_fsm_set_state_(NCIState::NFCC_SET_LISTEN_MODE_ROUTING);
      }
-      // fall through
+      [[fallthrough]];

    case NCIState::NFCC_SET_LISTEN_MODE_ROUTING:
      if (this->set_listen_mode_routing_() != nfc::STATUS_OK) {
@ -625,7 +625,7 @@ void PN7150::nci_fsm_transition_() {
      } else {
        this->nci_fsm_set_state_(NCIState::RFST_IDLE);
      }
-      // fall through
+      [[fallthrough]];

    case NCIState::RFST_IDLE:
      if (this->nci_state_error_ == NCIState::RFST_DISCOVERY) {
@ -650,14 +650,14 @@ void PN7150::nci_fsm_transition_() {

    case NCIState::RFST_W4_HOST_SELECT:
      select_endpoint_();
-      // fall through
+      [[fallthrough]];

    // All cases below are waiting for NOTIFICATION messages
    case NCIState::RFST_DISCOVERY:
      if (this->config_refresh_pending_) {
        this->refresh_core_config_();
      }
-      // fall through
+      [[fallthrough]];

    case NCIState::RFST_LISTEN_ACTIVE:
    case NCIState::RFST_LISTEN_SLEEP:
--- a/esphome/components/pn7160/pn7160.cpp
+++ b/esphome/components/pn7160/pn7160.cpp
@ -609,7 +609,7 @@ void PN7160::nci_fsm_transition_() {
      } else {
        this->nci_fsm_set_state_(NCIState::NFCC_INIT);
      }
-      // fall through
+      [[fallthrough]];

    case NCIState::NFCC_INIT:
      if (this->init_core_() != nfc::STATUS_OK) {
@ -619,7 +619,7 @@ void PN7160::nci_fsm_transition_() {
      } else {
        this->nci_fsm_set_state_(NCIState::NFCC_CONFIG);
      }
-      // fall through
+      [[fallthrough]];

    case NCIState::NFCC_CONFIG:
      if (this->send_init_config_() != nfc::STATUS_OK) {
@ -630,7 +630,7 @@ void PN7160::nci_fsm_transition_() {
        this->config_refresh_pending_ = false;
        this->nci_fsm_set_state_(NCIState::NFCC_SET_DISCOVER_MAP);
      }
-      // fall through
+      [[fallthrough]];

    case NCIState::NFCC_SET_DISCOVER_MAP:
      if (this->set_discover_map_() != nfc::STATUS_OK) {
@ -640,7 +640,7 @@ void PN7160::nci_fsm_transition_() {
      } else {
        this->nci_fsm_set_state_(NCIState::NFCC_SET_LISTEN_MODE_ROUTING);
      }
-      // fall through
+      [[fallthrough]];

    case NCIState::NFCC_SET_LISTEN_MODE_ROUTING:
      if (this->set_listen_mode_routing_() != nfc::STATUS_OK) {
@ -650,7 +650,7 @@ void PN7160::nci_fsm_transition_() {
      } else {
        this->nci_fsm_set_state_(NCIState::RFST_IDLE);
      }
-      // fall through
+      [[fallthrough]];

    case NCIState::RFST_IDLE:
      if (this->nci_state_error_ == NCIState::RFST_DISCOVERY) {
@ -675,14 +675,14 @@ void PN7160::nci_fsm_transition_() {

    case NCIState::RFST_W4_HOST_SELECT:
      select_endpoint_();
-      // fall through
+      [[fallthrough]];

    // All cases below are waiting for NOTIFICATION messages
    case NCIState::RFST_DISCOVERY:
      if (this->config_refresh_pending_) {
        this->refresh_core_config_();
      }
-      // fall through
+      [[fallthrough]];

    case NCIState::RFST_LISTEN_ACTIVE:
    case NCIState::RFST_LISTEN_SLEEP:
--- a/esphome/components/shelly_dimmer/stm32flash.cpp
+++ b/esphome/components/shelly_dimmer/stm32flash.cpp
@ -445,8 +445,7 @@ template<typename T> stm32_err_t stm32_check_ack_timeout(const stm32_err_t s_err
      return STM32_ERR_OK;
    case STM32_ERR_NACK:
      log();
-      // TODO: c++17 [[fallthrough]]
-      /* fallthrough */
+      [[fallthrough]];
    default:
      return STM32_ERR_UNKNOWN;
  }
--- a/esphome/core/component_iterator.cpp
+++ b/esphome/core/component_iterator.cpp
@ -375,7 +375,7 @@ void ComponentIterator::advance() {
  }

  if (advance_platform) {
-    this->state_ = static_cast<IteratorState>(static_cast<uint16_t>(this->state_) + 1);
+    this->state_ = static_cast<IteratorState>(static_cast<uint8_t>(this->state_) + 1);
    this->at_ = 0;
  } else if (success) {
    this->at_++;
--- a/esphome/idf_component.yml
+++ b/esphome/idf_component.yml
@ -1,16 +1,10 @@
 dependencies:
-  esp-tflite-micro:
-    git: https://github.com/espressif/esp-tflite-micro.git
-    version: v1.3.1
-  esp32_camera:
-    git: https://github.com/espressif/esp32-camera.git
-    version: v2.0.15
-  mdns:
-    git: https://github.com/espressif/esp-protocols.git
-    version: mdns-v1.8.2
-    path: components/mdns
-    rules:
-      - if: "idf_version >=5.0"
+  espressif/esp-tflite-micro:
+    version: 1.3.3~1
+  espressif/esp32-camera:
+    version: 2.0.15
+  espressif/mdns:
+    version: 1.8.2
  espressif/esp_wifi_remote:
    version: 0.10.2
    rules: