esphome 2025.7.4__py3-none-any.whl → 2025.8.0b1__py3-none-any.whl

esphome/components/mipi_spi/models/__init__.py

@@ -1,65 +0,0 @@
-from esphome.components.spi import TYPE_OCTAL, TYPE_QUAD, TYPE_SINGLE
-import esphome.config_validation as cv
-from esphome.const import CONF_HEIGHT, CONF_OFFSET_HEIGHT, CONF_OFFSET_WIDTH, CONF_WIDTH
-
-from .. import CONF_NATIVE_HEIGHT, CONF_NATIVE_WIDTH
-
-MADCTL_MY = 0x80  # Bit 7 Bottom to top
-MADCTL_MX = 0x40  # Bit 6 Right to left
-MADCTL_MV = 0x20  # Bit 5 Reverse Mode
-MADCTL_ML = 0x10  # Bit 4 LCD refresh Bottom to top
-MADCTL_RGB = 0x00  # Bit 3 Red-Green-Blue pixel order
-MADCTL_BGR = 0x08  # Bit 3 Blue-Green-Red pixel order
-MADCTL_MH = 0x04  # Bit 2 LCD refresh right to left
-
-# These bits are used instead of the above bits on some chips, where using MX and MY results in incorrect
-# partial updates.
-MADCTL_XFLIP = 0x02  # Mirror the display horizontally
-MADCTL_YFLIP = 0x01  # Mirror the display vertically
-
-DELAY_FLAG = 0xFFF  # Special flag to indicate a delay
-
-
-def delay(ms):
-    return DELAY_FLAG, ms
-
-
-class DriverChip:
-    models = {}
-
-    def __init__(
-        self,
-        name: str,
-        modes=(TYPE_SINGLE, TYPE_QUAD, TYPE_OCTAL),
-        initsequence=None,
-        **defaults,
-    ):
-        name = name.upper()
-        self.name = name
-        self.modes = modes
-        self.initsequence = initsequence
-        self.defaults = defaults
-        DriverChip.models[name] = self
-
-    def extend(self, name, **kwargs):
-        defaults = self.defaults.copy()
-        if (
-            CONF_WIDTH in defaults
-            and CONF_OFFSET_WIDTH in kwargs
-            and CONF_NATIVE_WIDTH not in defaults
-        ):
-            defaults[CONF_NATIVE_WIDTH] = defaults[CONF_WIDTH]
-        if (
-            CONF_HEIGHT in defaults
-            and CONF_OFFSET_HEIGHT in kwargs
-            and CONF_NATIVE_HEIGHT not in defaults
-        ):
-            defaults[CONF_NATIVE_HEIGHT] = defaults[CONF_HEIGHT]
-        defaults.update(kwargs)
-        return DriverChip(name, self.modes, initsequence=self.initsequence, **defaults)
-
-    def get_default(self, key, fallback=False):
-        return self.defaults.get(key, fallback)
-
-    def option(self, name, fallback=False):
-        return cv.Optional(name, default=self.get_default(name, fallback))

esphome/components/mipi_spi/models/adafruit.py

@@ -0,0 +1,30 @@
+from .ili import ST7789V
+
+ST7789V.extend(
+    "ADAFRUIT-FUNHOUSE",
+    height=240,
+    width=240,
+    offset_height=0,
+    offset_width=0,
+    cs_pin=40,
+    dc_pin=39,
+    reset_pin=41,
+    invert_colors=True,
+    mirror_x=True,
+    mirror_y=True,
+    data_rate="80MHz",
+)
+
+ST7789V.extend(
+    "ADAFRUIT-S2-TFT-FEATHER",
+    height=240,
+    width=135,
+    offset_height=52,
+    offset_width=40,
+    cs_pin=7,
+    dc_pin=39,
+    reset_pin=40,
+    invert_colors=True,
+)
+
+models = {}

esphome/components/mipi_spi/models/amoled.py

@@ -1,9 +1,22 @@
+from esphome.components.mipi import (
+    MIPI,
+    MODE_RGB,
+    NORON,
+    PAGESEL,
+    PIXFMT,
+    SLPOUT,
+    SPIMODESEL,
+    SWIRE1,
+    SWIRE2,
+    TEON,
+    WCE,
+    WRAM,
+    WRCTRLD,
+    DriverChip,
+    delay,
+)
 from esphome.components.spi import TYPE_QUAD
 
-from .. import MODE_RGB
-from . import DriverChip, delay
-from .commands import MIPI, NORON, PAGESEL, PIXFMT, SLPOUT, SWIRE1, SWIRE2, TEON, WRAM
-
 DriverChip(
     "T-DISPLAY-S3-AMOLED",
     width=240,
@@ -67,6 +80,29 @@ RM690B0 = DriverChip(
     ),
 )
 
-T4_S3_AMOLED = RM690B0.extend("T4-S3", width=450, offset_width=16, bus_mode=TYPE_QUAD)
+T4_S3_AMOLED = RM690B0.extend(
+    "T4-S3",
+    width=450,
+    offset_width=16,
+    cs_pin=11,
+    reset_pin=13,
+    enable_pin=9,
+    bus_mode=TYPE_QUAD,
+)
+
+CO5300 = DriverChip(
+    "CO5300",
+    brightness=0xD0,
+    color_order=MODE_RGB,
+    bus_mode=TYPE_QUAD,
+    initsequence=(
+        (SLPOUT,),  # Requires early SLPOUT
+        (PAGESEL, 0x00),
+        (SPIMODESEL, 0x80),
+        (WRCTRLD, 0x20),
+        (WCE, 0x00),
+    ),
+)
+
 
 models = {}

esphome/components/mipi_spi/models/ili.py

@@ -1,8 +1,4 @@
-from esphome.components.spi import TYPE_OCTAL
-
-from .. import MODE_RGB
-from . import DriverChip, delay
-from .commands import (
+from esphome.components.mipi import (
     ADJCTL3,
     CSCON,
     DFUNCTR,
@@ -18,6 +14,7 @@ from .commands import (
     IFCTR,
     IFMODE,
     INVCTR,
+    MODE_RGB,
     NORON,
     PWCTR1,
     PWCTR2,
@@ -32,7 +29,10 @@ from .commands import (
     VMCTR1,
     VMCTR2,
     VSCRSADD,
+    DriverChip,
+    delay,
 )
+from esphome.components.spi import TYPE_OCTAL
 
 DriverChip(
     "M5CORE",

esphome/components/mipi_spi/models/jc.py

@@ -1,10 +1,8 @@
+from esphome.components.mipi import MODE_RGB, DriverChip
 from esphome.components.spi import TYPE_QUAD
 import esphome.config_validation as cv
 from esphome.const import CONF_IGNORE_STRAPPING_WARNING, CONF_NUMBER
 
-from .. import MODE_RGB
-from . import DriverChip
-
 AXS15231 = DriverChip(
     "AXS15231",
     draw_rounding=8,

esphome/components/mipi_spi/models/lilygo.py

@@ -1,6 +1,6 @@
+from esphome.components.mipi import MODE_BGR
 from esphome.components.spi import TYPE_OCTAL
 
-from .. import MODE_BGR
 from .ili import ST7789V, ST7796
 
 ST7789V.extend(

esphome/components/mipi_spi/models/waveshare.py

@@ -1,4 +1,7 @@
-from . import DriverChip
+from esphome.components.mipi import DriverChip
+import esphome.config_validation as cv
+
+from .amoled import CO5300
 from .ili import ILI9488_A
 
 DriverChip(
@@ -128,6 +131,7 @@ DriverChip(
 
 ILI9488_A.extend(
     "PICO-RESTOUCH-LCD-3.5",
+    swap_xy=cv.UNDEFINED,
     spi_16=True,
     pixel_mode="16bit",
     mirror_x=True,
@@ -137,3 +141,14 @@ ILI9488_A.extend(
     data_rate="20MHz",
     invert_colors=True,
 )
+
+CO5300.extend(
+    "WAVESHARE-ESP32-S3-TOUCH-AMOLED-1.75",
+    width=466,
+    height=466,
+    pixel_mode="16bit",
+    offset_height=0,
+    offset_width=6,
+    cs_pin=12,
+    reset_pin=39,
+)

esphome/components/mixer/speaker/__init__.py

@@ -124,11 +124,10 @@ async def to_code(config):
 
     if task_stack_in_psram := config.get(CONF_TASK_STACK_IN_PSRAM):
         cg.add(var.set_task_stack_in_psram(task_stack_in_psram))
-        if task_stack_in_psram:
-            if config[CONF_TASK_STACK_IN_PSRAM]:
-                esp32.add_idf_sdkconfig_option(
-                    "CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY", True
-                )
+        if task_stack_in_psram and config[CONF_TASK_STACK_IN_PSRAM]:
+            esp32.add_idf_sdkconfig_option(
+                "CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY", True
+            )
 
     for speaker_config in config[CONF_SOURCE_SPEAKERS]:
         source_speaker = cg.new_Pvariable(speaker_config[CONF_ID])

esphome/components/mlx90393/sensor.py

@@ -63,11 +63,13 @@ def _validate(config):
                 raise cv.Invalid(
                     f"{axis}: {CONF_RESOLUTION} cannot be {res} with {CONF_TEMPERATURE_COMPENSATION} enabled"
                 )
-    if config[CONF_HALLCONF] == 0xC:
-        if (config[CONF_OVERSAMPLING], config[CONF_FILTER]) in [(0, 0), (1, 0), (0, 1)]:
-            raise cv.Invalid(
-                f"{CONF_OVERSAMPLING}=={config[CONF_OVERSAMPLING]} and {CONF_FILTER}=={config[CONF_FILTER]} not allowed with {CONF_HALLCONF}=={config[CONF_HALLCONF]:#02x}"
-            )
+    if config[CONF_HALLCONF] == 0xC and (
+        config[CONF_OVERSAMPLING],
+        config[CONF_FILTER],
+    ) in [(0, 0), (1, 0), (0, 1)]:
+        raise cv.Invalid(
+            f"{CONF_OVERSAMPLING}=={config[CONF_OVERSAMPLING]} and {CONF_FILTER}=={config[CONF_FILTER]} not allowed with {CONF_HALLCONF}=={config[CONF_HALLCONF]:#02x}"
+        )
     return config
 
 

esphome/components/mlx90393/sensor_mlx90393.cpp

@@ -103,7 +103,6 @@ bool MLX90393Cls::apply_all_settings_() {
 }
 
 void MLX90393Cls::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   // note the two arguments A0 and A1 which are used to construct an i2c address
   // we can hard-code these because we never actually use the constructed address
   // see the transceive function above, which uses the address from I2CComponent

esphome/components/mlx90614/mlx90614.cpp

@@ -28,7 +28,6 @@ static const uint8_t MLX90614_ID4 = 0x3F;
 static const char *const TAG = "mlx90614";
 
 void MLX90614Component::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   if (!this->write_emissivity_()) {
     ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
     this->mark_failed();

esphome/components/mmc5603/mmc5603.cpp

@@ -31,7 +31,6 @@ static const uint8_t MMC56X3_CTRL2_REG = 0x1D;
 static const uint8_t MMC5603_ODR_REG = 0x1A;
 
 void MMC5603Component::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   uint8_t id = 0;
   if (!this->read_byte(MMC56X3_PRODUCT_ID, &id)) {
     this->error_code_ = COMMUNICATION_FAILED;

esphome/components/mmc5983/mmc5983.cpp

@@ -67,8 +67,6 @@ void MMC5983Component::update() {
 }
 
 void MMC5983Component::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
-
   // Verify product id.
   const uint8_t mmc5983_product_id = 0x30;
   uint8_t id;

esphome/components/mpl3115a2/mpl3115a2.cpp

@@ -9,8 +9,6 @@ namespace mpl3115a2 {
 static const char *const TAG = "mpl3115a2";
 
 void MPL3115A2Component::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
-
   uint8_t whoami = 0xFF;
   if (!this->read_byte(MPL3115A2_WHOAMI, &whoami, false)) {
     this->error_code_ = COMMUNICATION_FAILED;

esphome/components/mpr121/__init__.py

@@ -56,12 +56,13 @@ def _final_validate(config):
         for binary_sensor in binary_sensors:
             if binary_sensor.get(CONF_MPR121_ID) == config[CONF_ID]:
                 max_touch_channel = max(max_touch_channel, binary_sensor[CONF_CHANNEL])
-    if max_touch_channel_in_config := config.get(CONF_MAX_TOUCH_CHANNEL):
-        if max_touch_channel != max_touch_channel_in_config:
-            raise cv.Invalid(
-                "Max touch channel must equal the highest binary sensor channel or be removed for auto calculation",
-                path=[CONF_MAX_TOUCH_CHANNEL],
-            )
+    if (
+        max_touch_channel_in_config := config.get(CONF_MAX_TOUCH_CHANNEL)
+    ) and max_touch_channel != max_touch_channel_in_config:
+        raise cv.Invalid(
+            "Max touch channel must equal the highest binary sensor channel or be removed for auto calculation",
+            path=[CONF_MAX_TOUCH_CHANNEL],
+        )
     path = fconf.get_path_for_id(config[CONF_ID])[:-1]
     this_config = fconf.get_config_for_path(path)
     this_config[CONF_MAX_TOUCH_CHANNEL] = max_touch_channel

esphome/components/mpr121/mpr121.cpp

@@ -11,7 +11,6 @@ namespace mpr121 {
 static const char *const TAG = "mpr121";
 
 void MPR121Component::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   // soft reset device
   this->write_byte(MPR121_SOFTRESET, 0x63);
   delay(100);  // NOLINT

esphome/components/mpu6050/mpu6050.cpp

@@ -21,7 +21,6 @@ const uint8_t MPU6050_BIT_TEMPERATURE_DISABLED = 3;
 const float GRAVITY_EARTH = 9.80665f;
 
 void MPU6050Component::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   uint8_t who_am_i;
   if (!this->read_byte(MPU6050_REGISTER_WHO_AM_I, &who_am_i) ||
       (who_am_i != 0x68 && who_am_i != 0x70 && who_am_i != 0x98)) {

esphome/components/mpu6886/mpu6886.cpp

@@ -26,7 +26,6 @@ const float TEMPERATURE_SENSITIVITY = 326.8;
 const float TEMPERATURE_OFFSET = 25.0;
 
 void MPU6886Component::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   uint8_t who_am_i;
   if (!this->read_byte(MPU6886_REGISTER_WHO_AM_I, &who_am_i) || who_am_i != MPU6886_WHO_AM_I_IDENTIFIER) {
     this->mark_failed();

esphome/components/mqtt/__init__.py

@@ -312,14 +312,13 @@ CONFIG_SCHEMA = cv.All(
 def exp_mqtt_message(config):
     if config is None:
         return cg.optional(cg.TemplateArguments(MQTTMessage))
-    exp = cg.StructInitializer(
+    return cg.StructInitializer(
         MQTTMessage,
         ("topic", config[CONF_TOPIC]),
         ("payload", config.get(CONF_PAYLOAD, "")),
         ("qos", config[CONF_QOS]),
         ("retain", config[CONF_RETAIN]),
     )
-    return exp
 
 
 @coroutine_with_priority(40.0)

esphome/components/mqtt/mqtt_button.cpp

@@ -27,7 +27,7 @@ void MQTTButtonComponent::setup() {
 }
 void MQTTButtonComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "MQTT Button '%s': ", this->button_->get_name().c_str());
-  LOG_MQTT_COMPONENT(true, true);
+  LOG_MQTT_COMPONENT(false, true);
 }
 
 void MQTTButtonComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryConfig &config) {

esphome/components/mqtt/mqtt_client.cpp

@@ -34,7 +34,6 @@ MQTTClientComponent::MQTTClientComponent() {
 
 // Connection
 void MQTTClientComponent::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   this->mqtt_backend_.set_on_message(
       [this](const char *topic, const char *payload, size_t len, size_t index, size_t total) {
         if (index == 0)

esphome/components/mqtt/mqtt_component.cpp

@@ -129,21 +129,16 @@ bool MQTTComponent::send_discovery_() {
             root[MQTT_PAYLOAD_NOT_AVAILABLE] = this->availability_->payload_not_available;
         }
 
-        std::string unique_id = this->unique_id();
         const MQTTDiscoveryInfo &discovery_info = global_mqtt_client->get_discovery_info();
-        if (!unique_id.empty()) {
-          root[MQTT_UNIQUE_ID] = unique_id;
+        if (discovery_info.unique_id_generator == MQTT_MAC_ADDRESS_UNIQUE_ID_GENERATOR) {
+          char friendly_name_hash[9];
+          sprintf(friendly_name_hash, "%08" PRIx32, fnv1_hash(this->friendly_name()));
+          friendly_name_hash[8] = 0;  // ensure the hash-string ends with null
+          root[MQTT_UNIQUE_ID] = get_mac_address() + "-" + this->component_type() + "-" + friendly_name_hash;
         } else {
-          if (discovery_info.unique_id_generator == MQTT_MAC_ADDRESS_UNIQUE_ID_GENERATOR) {
-            char friendly_name_hash[9];
-            sprintf(friendly_name_hash, "%08" PRIx32, fnv1_hash(this->friendly_name()));
-            friendly_name_hash[8] = 0;  // ensure the hash-string ends with null
-            root[MQTT_UNIQUE_ID] = get_mac_address() + "-" + this->component_type() + "-" + friendly_name_hash;
-          } else {
-            // default to almost-unique ID. It's a hack but the only way to get that
-            // gorgeous device registry view.
-            root[MQTT_UNIQUE_ID] = "ESP" + this->component_type() + this->get_default_object_id_();
-          }
+          // default to almost-unique ID. It's a hack but the only way to get that
+          // gorgeous device registry view.
+          root[MQTT_UNIQUE_ID] = "ESP" + this->component_type() + this->get_default_object_id_();
         }
 
         const std::string &node_name = App.get_name();
@@ -286,7 +281,6 @@ void MQTTComponent::call_dump_config() {
   this->dump_config();
 }
 void MQTTComponent::schedule_resend_state() { this->resend_state_ = true; }
-std::string MQTTComponent::unique_id() { return ""; }
 bool MQTTComponent::is_connected_() const { return global_mqtt_client->is_connected(); }
 
 // Pull these properties from EntityBase if not overridden

esphome/components/mqtt/mqtt_component.h

@@ -164,13 +164,6 @@ class MQTTComponent : public Component {
    */
   virtual const EntityBase *get_entity() const = 0;
 
-  /** A unique ID for this MQTT component, empty for no unique id. See unique ID requirements:
-   * https://developers.home-assistant.io/docs/en/entity_registry_index.html#unique-id-requirements
-   *
-   * @return The unique id as a string.
-   */
-  virtual std::string unique_id();
-
   /// Get the friendly name of this MQTT component.
   virtual std::string friendly_name() const;
 

esphome/components/mqtt/mqtt_sensor.cpp

@@ -76,7 +76,6 @@ bool MQTTSensorComponent::publish_state(float value) {
   int8_t accuracy = this->sensor_->get_accuracy_decimals();
   return this->publish(this->get_state_topic_(), value_accuracy_to_string(value, accuracy));
 }
-std::string MQTTSensorComponent::unique_id() { return this->sensor_->unique_id(); }
 
 }  // namespace mqtt
 }  // namespace esphome

esphome/components/mqtt/mqtt_sensor.h

@@ -46,7 +46,6 @@ class MQTTSensorComponent : public mqtt::MQTTComponent {
   /// Override for MQTTComponent, returns "sensor".
   std::string component_type() const override;
   const EntityBase *get_entity() const override;
-  std::string unique_id() override;
 
   sensor::Sensor *sensor_;
   optional<uint32_t> expire_after_;  // Override the expire after advertised to Home Assistant

esphome/components/mqtt/mqtt_text_sensor.cpp

@@ -40,7 +40,6 @@ bool MQTTTextSensor::send_initial_state() {
 }
 std::string MQTTTextSensor::component_type() const { return "sensor"; }
 const EntityBase *MQTTTextSensor::get_entity() const { return this->sensor_; }
-std::string MQTTTextSensor::unique_id() { return this->sensor_->unique_id(); }
 
 }  // namespace mqtt
 }  // namespace esphome

esphome/components/mqtt/mqtt_text_sensor.h

@@ -28,7 +28,6 @@ class MQTTTextSensor : public mqtt::MQTTComponent {
  protected:
   std::string component_type() const override;
   const EntityBase *get_entity() const override;
-  std::string unique_id() override;
 
   text_sensor::TextSensor *sensor_;
 };

esphome/components/ms5611/ms5611.cpp

@@ -15,7 +15,6 @@ static const uint8_t MS5611_CMD_CONV_D2 = 0x50;
 static const uint8_t MS5611_CMD_READ_PROM = 0xA2;
 
 void MS5611Component::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   if (!this->write_bytes(MS5611_CMD_RESET, nullptr, 0)) {
     this->mark_failed();
     return;

esphome/components/ms8607/ms8607.cpp

@@ -67,7 +67,6 @@ static uint8_t crc4(uint16_t *buffer, size_t length);
 static uint8_t hsensor_crc_check(uint16_t value);
 
 void MS8607Component::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   this->error_code_ = ErrorCode::NONE;
   this->setup_status_ = SetupStatus::NEEDS_RESET;
 

esphome/components/msa3xx/msa3xx.cpp

@@ -118,8 +118,6 @@ const char *orientation_xy_to_string(OrientationXY orientation) {
 const char *orientation_z_to_string(bool orientation) { return orientation ? "Downwards looking" : "Upwards looking"; }
 
 void MSA3xxComponent::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
-
   uint8_t part_id{0xff};
   if (!this->read_byte(static_cast<uint8_t>(RegisterMap::PART_ID), &part_id) || (part_id != MSA_3XX_PART_ID)) {
     ESP_LOGE(TAG, "Part ID is wrong or missing. Got 0x%02X", part_id);

esphome/components/my9231/my9231.cpp

@@ -28,7 +28,6 @@ static const uint8_t MY9231_CMD_SCATTER_APDM = 0x0 << 0;
 static const uint8_t MY9231_CMD_SCATTER_PWM = 0x1 << 0;
 
 void MY9231OutputComponent::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
   this->pin_di_->setup();
   this->pin_di_->digital_write(false);
   this->pin_dcki_->setup();
@@ -57,7 +56,6 @@ void MY9231OutputComponent::setup() {
     this->send_dcki_pulses_(32 * this->num_chips_);
     this->init_chips_(command);
   }
-  ESP_LOGV(TAG, "  Chips initialized.");
 }
 void MY9231OutputComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "MY9231:");

esphome/components/nau7802/nau7802.cpp

@@ -52,7 +52,6 @@ static const uint8_t POWER_PGA_CAP_EN = 0x80;
 static const uint8_t DEVICE_REV = 0x1F;
 
 void NAU7802Sensor::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup for '%s'", this->name_.c_str());
   i2c::I2CRegister pu_ctrl = this->reg(PU_CTRL_REG);
   uint8_t rev;
 

esphome/components/neopixelbus/light.py

@@ -225,6 +225,9 @@ async def to_code(config):
     # https://github.com/Makuna/NeoPixelBus/blob/master/library.json
     # Version Listed Here: https://registry.platformio.org/libraries/makuna/NeoPixelBus/versions
     if CORE.is_esp32:
+        # disable built in rgb support as it uses the new RMT drivers and will
+        # conflict with NeoPixelBus which uses the legacy drivers
+        cg.add_build_flag("-DESP32_ARDUINO_NO_RGB_BUILTIN")
         cg.add_library("makuna/NeoPixelBus", "2.8.0")
     else:
         cg.add_library("makuna/NeoPixelBus", "2.7.3")

esphome/components/network/util.cpp

@@ -13,15 +13,27 @@
 #include "esphome/components/openthread/openthread.h"
 #endif
 
+#ifdef USE_MODEM
+#include "esphome/components/modem/modem_component.h"
+#endif
+
 namespace esphome {
 namespace network {
 
+// The order of the components is important: WiFi should come after any possible main interfaces (it may be used as
+// an AP that use a previous interface for NAT).
+
 bool is_connected() {
 #ifdef USE_ETHERNET
   if (ethernet::global_eth_component != nullptr && ethernet::global_eth_component->is_connected())
     return true;
 #endif
 
+#ifdef USE_MODEM
+  if (modem::global_modem_component != nullptr)
+    return modem::global_modem_component->is_connected();
+#endif
+
 #ifdef USE_WIFI
   if (wifi::global_wifi_component != nullptr)
     return wifi::global_wifi_component->is_connected();
@@ -39,6 +51,11 @@ bool is_connected() {
 }
 
 bool is_disabled() {
+#ifdef USE_MODEM
+  if (modem::global_modem_component != nullptr)
+    return modem::global_modem_component->is_disabled();
+#endif
+
 #ifdef USE_WIFI
   if (wifi::global_wifi_component != nullptr)
     return wifi::global_wifi_component->is_disabled();
@@ -51,6 +68,12 @@ network::IPAddresses get_ip_addresses() {
   if (ethernet::global_eth_component != nullptr)
     return ethernet::global_eth_component->get_ip_addresses();
 #endif
+
+#ifdef USE_MODEM
+  if (modem::global_modem_component != nullptr)
+    return modem::global_modem_component->get_ip_addresses();
+#endif
+
 #ifdef USE_WIFI
   if (wifi::global_wifi_component != nullptr)
     return wifi::global_wifi_component->get_ip_addresses();
@@ -67,6 +90,12 @@ std::string get_use_address() {
   if (ethernet::global_eth_component != nullptr)
     return ethernet::global_eth_component->get_use_address();
 #endif
+
+#ifdef USE_MODEM
+  if (modem::global_modem_component != nullptr)
+    return modem::global_modem_component->get_use_address();
+#endif
+
 #ifdef USE_WIFI
   if (wifi::global_wifi_component != nullptr)
     return wifi::global_wifi_component->get_use_address();

esphome/components/nextion/nextion.cpp

@@ -450,7 +450,6 @@ void Nextion::process_nextion_commands_() {
         this->remove_from_q_();
         if (!this->is_setup_) {
           if (this->nextion_queue_.empty()) {
-            ESP_LOGD(TAG, "Setup complete");
             this->is_setup_ = true;
             this->setup_callback_.call();
           }

esphome/components/nfc/binary_sensor/{binary_sensor.cpp → nfc_binary_sensor.cpp}

@@ -1,4 +1,4 @@
-#include "binary_sensor.h"
+#include "nfc_binary_sensor.h"
 #include "../nfc_helpers.h"
 #include "esphome/core/log.h"
 

esphome/components/npi19/npi19.cpp

@@ -11,8 +11,6 @@ static const char *const TAG = "npi19";
 static const uint8_t READ_COMMAND = 0xAC;
 
 void NPI19Component::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
-
   uint16_t raw_temperature(0);
   uint16_t raw_pressure(0);
   i2c::ErrorCode err = this->read_(raw_temperature, raw_pressure);