From 218f8e0cafd3bd5ae35889852ce6e1cbaf2f4c16 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 May 2025 15:42:44 -0400 Subject: [PATCH 01/16] Bump ruff from 0.11.9 to 0.11.10 (#8818) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_test.txt b/requirements_test.txt index 6dd8d883ba..863c320d96 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -1,6 +1,6 @@ pylint==3.3.7 flake8==7.2.0 # also change in .pre-commit-config.yaml when updating -ruff==0.11.9 # also change in .pre-commit-config.yaml when updating +ruff==0.11.10 # also change in .pre-commit-config.yaml when updating pyupgrade==3.19.1 # also change in .pre-commit-config.yaml when updating pre-commit From b469a504e46649c6f51783ae4a5df98cae63f4e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 May 2025 15:42:51 -0400 Subject: [PATCH 02/16] Bump cairosvg from 2.8.1 to 2.8.2 (#8817) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ae4f9d1558..d867610c5b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,7 +19,7 @@ puremagic==1.29 ruamel.yaml==0.18.10 # dashboard_import esphome-glyphsets==0.2.0 pillow==10.4.0 -cairosvg==2.8.1 +cairosvg==2.8.2 freetype-py==2.5.1 # esp-idf requires this, but doesn't bundle it by default From 5c92367ca23470d8f2e0d7d71ca54cf2febaa659 Mon Sep 17 00:00:00 2001 From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com> Date: Sat, 17 May 2025 09:41:19 +1000 Subject: [PATCH 03/16] [script] Use local import for zephyr (#8822) --- script/helpers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/script/helpers.py b/script/helpers.py index 3c1b0c0ddd..1a0349e434 100644 --- a/script/helpers.py +++ b/script/helpers.py @@ -5,7 +5,6 @@ import re import subprocess import colorama -import helpers_zephyr root_path = os.path.abspath(os.path.normpath(os.path.join(__file__, "..", ".."))) basepath = os.path.join(root_path, "esphome") @@ -149,7 +148,9 @@ def load_idedata(environment): Path(temp_folder).mkdir(exist_ok=True) if "nrf" in environment: - data = helpers_zephyr.load_idedata(environment, temp_folder, platformio_ini) + from helpers_zephyr import load_idedata as zephyr_load_idedata + + data = zephyr_load_idedata(environment, temp_folder, platformio_ini) else: stdout = subprocess.check_output( ["pio", "run", "-t", "idedata", "-e", environment] From fefcb45e1f569fb7eb9f3bbd7c27446436c98562 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sat, 17 May 2025 22:50:06 -0400 Subject: [PATCH 04/16] Bump cryptography to 45.0.1 (#8826) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d867610c5b..498834ddb1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ async_timeout==5.0.1; python_version <= "3.10" -cryptography==44.0.2 +cryptography==45.0.1 voluptuous==0.15.2 PyYAML==6.0.2 paho-mqtt==1.6.1 From e87b65948352a559457f96fb2cd0b6ac942f25f8 Mon Sep 17 00:00:00 2001 From: Keith Burzinski Date: Sat, 17 May 2025 22:05:03 -0500 Subject: [PATCH 05/16] [sen5x] Fix validation for values read from hardware (#8769) --- esphome/components/sen5x/sen5x.cpp | 89 ++++++++++++++++++------------ 1 file changed, 54 insertions(+), 35 deletions(-) diff --git a/esphome/components/sen5x/sen5x.cpp b/esphome/components/sen5x/sen5x.cpp index 0efc961943..f29ba18d6e 100644 --- a/esphome/components/sen5x/sen5x.cpp +++ b/esphome/components/sen5x/sen5x.cpp @@ -25,6 +25,10 @@ static const uint16_t SEN5X_CMD_TEMPERATURE_COMPENSATION = 0x60B2; static const uint16_t SEN5X_CMD_VOC_ALGORITHM_STATE = 0x6181; static const uint16_t SEN5X_CMD_VOC_ALGORITHM_TUNING = 0x60D0; +static const int8_t SEN5X_INDEX_SCALE_FACTOR = 10; // used for VOC and NOx index values +static const int8_t SEN5X_MIN_INDEX_VALUE = 1 * SEN5X_INDEX_SCALE_FACTOR; // must be adjusted by the scale factor +static const int16_t SEN5X_MAX_INDEX_VALUE = 500 * SEN5X_INDEX_SCALE_FACTOR; // must be adjusted by the scale factor + void SEN5XComponent::setup() { ESP_LOGCONFIG(TAG, "Setting up sen5x..."); @@ -88,8 +92,9 @@ void SEN5XComponent::setup() { product_name_.push_back(current_char); // second char current_char = *current_int & 0xFF; - if (current_char) + if (current_char) { product_name_.push_back(current_char); + } } current_int++; } while (current_char && --max); @@ -271,10 +276,10 @@ void SEN5XComponent::dump_config() { ESP_LOGCONFIG(TAG, " Low RH/T acceleration mode"); break; case MEDIUM_ACCELERATION: - ESP_LOGCONFIG(TAG, " Medium RH/T accelertion mode"); + ESP_LOGCONFIG(TAG, " Medium RH/T acceleration mode"); break; case HIGH_ACCELERATION: - ESP_LOGCONFIG(TAG, " High RH/T accelertion mode"); + ESP_LOGCONFIG(TAG, " High RH/T acceleration mode"); break; } } @@ -337,47 +342,61 @@ void SEN5XComponent::update() { ESP_LOGD(TAG, "read data error (%d)", this->last_error_); return; } - float pm_1_0 = measurements[0] / 10.0; - if (measurements[0] == 0xFFFF) - pm_1_0 = NAN; - float pm_2_5 = measurements[1] / 10.0; - if (measurements[1] == 0xFFFF) - pm_2_5 = NAN; - float pm_4_0 = measurements[2] / 10.0; - if (measurements[2] == 0xFFFF) - pm_4_0 = NAN; - float pm_10_0 = measurements[3] / 10.0; - if (measurements[3] == 0xFFFF) - pm_10_0 = NAN; - float humidity = measurements[4] / 100.0; - if (measurements[4] == 0xFFFF) - humidity = NAN; - float temperature = (int16_t) measurements[5] / 200.0; - if (measurements[5] == 0xFFFF) - temperature = NAN; - float voc = measurements[6] / 10.0; - if (measurements[6] == 0xFFFF) - voc = NAN; - float nox = measurements[7] / 10.0; - if (measurements[7] == 0xFFFF) - nox = NAN; - if (this->pm_1_0_sensor_ != nullptr) + ESP_LOGVV(TAG, "pm_1_0 = 0x%.4x", measurements[0]); + float pm_1_0 = measurements[0] == UINT16_MAX ? NAN : measurements[0] / 10.0f; + + ESP_LOGVV(TAG, "pm_2_5 = 0x%.4x", measurements[1]); + float pm_2_5 = measurements[1] == UINT16_MAX ? NAN : measurements[1] / 10.0f; + + ESP_LOGVV(TAG, "pm_4_0 = 0x%.4x", measurements[2]); + float pm_4_0 = measurements[2] == UINT16_MAX ? NAN : measurements[2] / 10.0f; + + ESP_LOGVV(TAG, "pm_10_0 = 0x%.4x", measurements[3]); + float pm_10_0 = measurements[3] == UINT16_MAX ? NAN : measurements[3] / 10.0f; + + ESP_LOGVV(TAG, "humidity = 0x%.4x", measurements[4]); + float humidity = measurements[4] == INT16_MAX ? NAN : static_cast(measurements[4]) / 100.0f; + + ESP_LOGVV(TAG, "temperature = 0x%.4x", measurements[5]); + float temperature = measurements[5] == INT16_MAX ? NAN : static_cast(measurements[5]) / 200.0f; + + ESP_LOGVV(TAG, "voc = 0x%.4x", measurements[6]); + int16_t voc_idx = static_cast(measurements[6]); + float voc = (voc_idx < SEN5X_MIN_INDEX_VALUE || voc_idx > SEN5X_MAX_INDEX_VALUE) + ? NAN + : static_cast(voc_idx) / 10.0f; + + ESP_LOGVV(TAG, "nox = 0x%.4x", measurements[7]); + int16_t nox_idx = static_cast(measurements[7]); + float nox = (nox_idx < SEN5X_MIN_INDEX_VALUE || nox_idx > SEN5X_MAX_INDEX_VALUE) + ? NAN + : static_cast(nox_idx) / 10.0f; + + if (this->pm_1_0_sensor_ != nullptr) { this->pm_1_0_sensor_->publish_state(pm_1_0); - if (this->pm_2_5_sensor_ != nullptr) + } + if (this->pm_2_5_sensor_ != nullptr) { this->pm_2_5_sensor_->publish_state(pm_2_5); - if (this->pm_4_0_sensor_ != nullptr) + } + if (this->pm_4_0_sensor_ != nullptr) { this->pm_4_0_sensor_->publish_state(pm_4_0); - if (this->pm_10_0_sensor_ != nullptr) + } + if (this->pm_10_0_sensor_ != nullptr) { this->pm_10_0_sensor_->publish_state(pm_10_0); - if (this->temperature_sensor_ != nullptr) + } + if (this->temperature_sensor_ != nullptr) { this->temperature_sensor_->publish_state(temperature); - if (this->humidity_sensor_ != nullptr) + } + if (this->humidity_sensor_ != nullptr) { this->humidity_sensor_->publish_state(humidity); - if (this->voc_sensor_ != nullptr) + } + if (this->voc_sensor_ != nullptr) { this->voc_sensor_->publish_state(voc); - if (this->nox_sensor_ != nullptr) + } + if (this->nox_sensor_ != nullptr) { this->nox_sensor_->publish_state(nox); + } this->status_clear_warning(); }); } From 18ac1b7c549ed4e3fe3e55dfdb81fc5bbb08a729 Mon Sep 17 00:00:00 2001 From: Anton Sergunov Date: Sun, 18 May 2025 09:11:09 +0600 Subject: [PATCH 06/16] Fix the case of single error (#8824) --- esphome/voluptuous_schema.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/esphome/voluptuous_schema.py b/esphome/voluptuous_schema.py index 15f9206f21..8fb966e3b2 100644 --- a/esphome/voluptuous_schema.py +++ b/esphome/voluptuous_schema.py @@ -15,7 +15,9 @@ class ExtraKeysInvalid(vol.Invalid): def ensure_multiple_invalid(err): if isinstance(err, vol.MultipleInvalid): return err - return vol.MultipleInvalid(err) + if isinstance(err, list): + return vol.MultipleInvalid(err) + return vol.MultipleInvalid([err]) # pylint: disable=protected-access, unidiomatic-typecheck From 44470f31f60d708abd74b262330173fdea1c048e Mon Sep 17 00:00:00 2001 From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com> Date: Sun, 18 May 2025 13:30:08 +1000 Subject: [PATCH 07/16] Revert "[binary_sensor] initial state refactor" (#8828) --- .../binary_sensor/binary_sensor.cpp | 16 ++++--- .../components/binary_sensor/binary_sensor.h | 2 +- esphome/components/binary_sensor/filter.cpp | 42 +++++++++---------- esphome/components/binary_sensor/filter.h | 20 ++++----- 4 files changed, 42 insertions(+), 38 deletions(-) diff --git a/esphome/components/binary_sensor/binary_sensor.cpp b/esphome/components/binary_sensor/binary_sensor.cpp index 30fbe4f0b4..20604a0b7e 100644 --- a/esphome/components/binary_sensor/binary_sensor.cpp +++ b/esphome/components/binary_sensor/binary_sensor.cpp @@ -15,17 +15,21 @@ void BinarySensor::publish_state(bool state) { if (!this->publish_dedup_.next(state)) return; if (this->filter_list_ == nullptr) { - this->send_state_internal(state); + this->send_state_internal(state, false); } else { - this->filter_list_->input(state); + this->filter_list_->input(state, false); } } void BinarySensor::publish_initial_state(bool state) { - this->has_state_ = false; - this->publish_state(state); + if (!this->publish_dedup_.next(state)) + return; + if (this->filter_list_ == nullptr) { + this->send_state_internal(state, true); + } else { + this->filter_list_->input(state, true); + } } -void BinarySensor::send_state_internal(bool state) { - bool is_initial = !this->has_state_; +void BinarySensor::send_state_internal(bool state, bool is_initial) { if (is_initial) { ESP_LOGD(TAG, "'%s': Sending initial state %s", this->get_name().c_str(), ONOFF(state)); } else { diff --git a/esphome/components/binary_sensor/binary_sensor.h b/esphome/components/binary_sensor/binary_sensor.h index 9ba7aeeeff..57cae9e2f5 100644 --- a/esphome/components/binary_sensor/binary_sensor.h +++ b/esphome/components/binary_sensor/binary_sensor.h @@ -67,7 +67,7 @@ class BinarySensor : public EntityBase, public EntityBase_DeviceClass { // ========== INTERNAL METHODS ========== // (In most use cases you won't need these) - void send_state_internal(bool state); + void send_state_internal(bool state, bool is_initial); /// Return whether this binary sensor has outputted a state. virtual bool has_state() const; diff --git a/esphome/components/binary_sensor/filter.cpp b/esphome/components/binary_sensor/filter.cpp index fd6cc31008..8f94b108ac 100644 --- a/esphome/components/binary_sensor/filter.cpp +++ b/esphome/components/binary_sensor/filter.cpp @@ -9,37 +9,37 @@ namespace binary_sensor { static const char *const TAG = "sensor.filter"; -void Filter::output(bool value) { +void Filter::output(bool value, bool is_initial) { if (!this->dedup_.next(value)) return; if (this->next_ == nullptr) { - this->parent_->send_state_internal(value); + this->parent_->send_state_internal(value, is_initial); } else { - this->next_->input(value); + this->next_->input(value, is_initial); } } -void Filter::input(bool value) { - auto b = this->new_value(value); +void Filter::input(bool value, bool is_initial) { + auto b = this->new_value(value, is_initial); if (b.has_value()) { - this->output(*b); + this->output(*b, is_initial); } } -optional DelayedOnOffFilter::new_value(bool value) { +optional DelayedOnOffFilter::new_value(bool value, bool is_initial) { if (value) { - this->set_timeout("ON_OFF", this->on_delay_.value(), [this]() { this->output(true); }); + this->set_timeout("ON_OFF", this->on_delay_.value(), [this, is_initial]() { this->output(true, is_initial); }); } else { - this->set_timeout("ON_OFF", this->off_delay_.value(), [this]() { this->output(false); }); + this->set_timeout("ON_OFF", this->off_delay_.value(), [this, is_initial]() { this->output(false, is_initial); }); } return {}; } float DelayedOnOffFilter::get_setup_priority() const { return setup_priority::HARDWARE; } -optional DelayedOnFilter::new_value(bool value) { +optional DelayedOnFilter::new_value(bool value, bool is_initial) { if (value) { - this->set_timeout("ON", this->delay_.value(), [this]() { this->output(true); }); + this->set_timeout("ON", this->delay_.value(), [this, is_initial]() { this->output(true, is_initial); }); return {}; } else { this->cancel_timeout("ON"); @@ -49,9 +49,9 @@ optional DelayedOnFilter::new_value(bool value) { float DelayedOnFilter::get_setup_priority() const { return setup_priority::HARDWARE; } -optional DelayedOffFilter::new_value(bool value) { +optional DelayedOffFilter::new_value(bool value, bool is_initial) { if (!value) { - this->set_timeout("OFF", this->delay_.value(), [this]() { this->output(false); }); + this->set_timeout("OFF", this->delay_.value(), [this, is_initial]() { this->output(false, is_initial); }); return {}; } else { this->cancel_timeout("OFF"); @@ -61,11 +61,11 @@ optional DelayedOffFilter::new_value(bool value) { float DelayedOffFilter::get_setup_priority() const { return setup_priority::HARDWARE; } -optional InvertFilter::new_value(bool value) { return !value; } +optional InvertFilter::new_value(bool value, bool is_initial) { return !value; } AutorepeatFilter::AutorepeatFilter(std::vector timings) : timings_(std::move(timings)) {} -optional AutorepeatFilter::new_value(bool value) { +optional AutorepeatFilter::new_value(bool value, bool is_initial) { if (value) { // Ignore if already running if (this->active_timing_ != 0) @@ -101,7 +101,7 @@ void AutorepeatFilter::next_timing_() { void AutorepeatFilter::next_value_(bool val) { const AutorepeatFilterTiming &timing = this->timings_[this->active_timing_ - 2]; - this->output(val); + this->output(val, false); // This is at least the second one so not initial this->set_timeout("ON_OFF", val ? timing.time_on : timing.time_off, [this, val]() { this->next_value_(!val); }); } @@ -109,18 +109,18 @@ float AutorepeatFilter::get_setup_priority() const { return setup_priority::HARD LambdaFilter::LambdaFilter(std::function(bool)> f) : f_(std::move(f)) {} -optional LambdaFilter::new_value(bool value) { return this->f_(value); } +optional LambdaFilter::new_value(bool value, bool is_initial) { return this->f_(value); } -optional SettleFilter::new_value(bool value) { +optional SettleFilter::new_value(bool value, bool is_initial) { if (!this->steady_) { - this->set_timeout("SETTLE", this->delay_.value(), [this, value]() { + this->set_timeout("SETTLE", this->delay_.value(), [this, value, is_initial]() { this->steady_ = true; - this->output(value); + this->output(value, is_initial); }); return {}; } else { this->steady_ = false; - this->output(value); + this->output(value, is_initial); this->set_timeout("SETTLE", this->delay_.value(), [this]() { this->steady_ = true; }); return value; } diff --git a/esphome/components/binary_sensor/filter.h b/esphome/components/binary_sensor/filter.h index 65838da49d..f7342db2fb 100644 --- a/esphome/components/binary_sensor/filter.h +++ b/esphome/components/binary_sensor/filter.h @@ -14,11 +14,11 @@ class BinarySensor; class Filter { public: - virtual optional new_value(bool value) = 0; + virtual optional new_value(bool value, bool is_initial) = 0; - void input(bool value); + void input(bool value, bool is_initial); - void output(bool value); + void output(bool value, bool is_initial); protected: friend BinarySensor; @@ -30,7 +30,7 @@ class Filter { class DelayedOnOffFilter : public Filter, public Component { public: - optional new_value(bool value) override; + optional new_value(bool value, bool is_initial) override; float get_setup_priority() const override; @@ -44,7 +44,7 @@ class DelayedOnOffFilter : public Filter, public Component { class DelayedOnFilter : public Filter, public Component { public: - optional new_value(bool value) override; + optional new_value(bool value, bool is_initial) override; float get_setup_priority() const override; @@ -56,7 +56,7 @@ class DelayedOnFilter : public Filter, public Component { class DelayedOffFilter : public Filter, public Component { public: - optional new_value(bool value) override; + optional new_value(bool value, bool is_initial) override; float get_setup_priority() const override; @@ -68,7 +68,7 @@ class DelayedOffFilter : public Filter, public Component { class InvertFilter : public Filter { public: - optional new_value(bool value) override; + optional new_value(bool value, bool is_initial) override; }; struct AutorepeatFilterTiming { @@ -86,7 +86,7 @@ class AutorepeatFilter : public Filter, public Component { public: explicit AutorepeatFilter(std::vector timings); - optional new_value(bool value) override; + optional new_value(bool value, bool is_initial) override; float get_setup_priority() const override; @@ -102,7 +102,7 @@ class LambdaFilter : public Filter { public: explicit LambdaFilter(std::function(bool)> f); - optional new_value(bool value) override; + optional new_value(bool value, bool is_initial) override; protected: std::function(bool)> f_; @@ -110,7 +110,7 @@ class LambdaFilter : public Filter { class SettleFilter : public Filter, public Component { public: - optional new_value(bool value) override; + optional new_value(bool value, bool is_initial) override; float get_setup_priority() const override; From a78bea78f9d7c6ea8f19acf7ae2999fee09075a9 Mon Sep 17 00:00:00 2001 From: Kent Gibson Date: Sun, 18 May 2025 11:45:12 +0800 Subject: [PATCH 08/16] Fix misspelling of climate in climate_ir.climate_ir_with_receiver_schema (#8829) --- esphome/components/ballu/climate.py | 2 +- esphome/components/climate_ir/__init__.py | 6 +++--- esphome/components/climate_ir_lg/climate.py | 2 +- esphome/components/coolix/climate.py | 2 +- esphome/components/daikin/climate.py | 2 +- esphome/components/daikin_arc/climate.py | 2 +- esphome/components/daikin_brc/climate.py | 2 +- esphome/components/delonghi/climate.py | 2 +- esphome/components/emmeti/climate.py | 2 +- esphome/components/fujitsu_general/climate.py | 2 +- esphome/components/gree/climate.py | 2 +- esphome/components/heatpumpir/climate.py | 2 +- esphome/components/hitachi_ac344/climate.py | 2 +- esphome/components/hitachi_ac424/climate.py | 2 +- esphome/components/midea_ir/climate.py | 2 +- esphome/components/mitsubishi/climate.py | 2 +- esphome/components/noblex/climate.py | 2 +- esphome/components/tcl112/climate.py | 2 +- esphome/components/toshiba/climate.py | 2 +- esphome/components/whirlpool/climate.py | 2 +- esphome/components/whynter/climate.py | 2 +- esphome/components/zhlt01/climate.py | 2 +- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/esphome/components/ballu/climate.py b/esphome/components/ballu/climate.py index e35a1d244d..1127084632 100644 --- a/esphome/components/ballu/climate.py +++ b/esphome/components/ballu/climate.py @@ -7,7 +7,7 @@ CODEOWNERS = ["@bazuchan"] ballu_ns = cg.esphome_ns.namespace("ballu") BalluClimate = ballu_ns.class_("BalluClimate", climate_ir.ClimateIR) -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(BalluClimate) +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(BalluClimate) async def to_code(config): diff --git a/esphome/components/climate_ir/__init__.py b/esphome/components/climate_ir/__init__.py index 32b614e933..312b2ad900 100644 --- a/esphome/components/climate_ir/__init__.py +++ b/esphome/components/climate_ir/__init__.py @@ -40,7 +40,7 @@ def climate_ir_schema( ) -def climare_ir_with_receiver_schema( +def climate_ir_with_receiver_schema( class_: MockObjClass, ) -> cv.Schema: return climate_ir_schema(class_).extend( @@ -59,7 +59,7 @@ def deprecated_schema_constant(config): type = str(id.type).split("::", maxsplit=1)[0] _LOGGER.warning( "Using `climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA` is deprecated and will be removed in ESPHome 2025.11.0. " - "Please use `climate_ir.climare_ir_with_receiver_schema(...)` instead. " + "Please use `climate_ir.climate_ir_with_receiver_schema(...)` instead. " "If you are seeing this, report an issue to the external_component author and ask them to update it. " "https://developers.esphome.io/blog/2025/05/14/_schema-deprecations/. " "Component using this schema: %s", @@ -68,7 +68,7 @@ def deprecated_schema_constant(config): return config -CLIMATE_IR_WITH_RECEIVER_SCHEMA = climare_ir_with_receiver_schema(ClimateIR) +CLIMATE_IR_WITH_RECEIVER_SCHEMA = climate_ir_with_receiver_schema(ClimateIR) CLIMATE_IR_WITH_RECEIVER_SCHEMA.add_extra(deprecated_schema_constant) diff --git a/esphome/components/climate_ir_lg/climate.py b/esphome/components/climate_ir_lg/climate.py index de824bfe5c..9c832642ce 100644 --- a/esphome/components/climate_ir_lg/climate.py +++ b/esphome/components/climate_ir_lg/climate.py @@ -13,7 +13,7 @@ CONF_BIT_HIGH = "bit_high" CONF_BIT_ONE_LOW = "bit_one_low" CONF_BIT_ZERO_LOW = "bit_zero_low" -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(LgIrClimate).extend( +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(LgIrClimate).extend( { cv.Optional( CONF_HEADER_HIGH, default="8000us" diff --git a/esphome/components/coolix/climate.py b/esphome/components/coolix/climate.py index b280544a5c..1ebcff3c1b 100644 --- a/esphome/components/coolix/climate.py +++ b/esphome/components/coolix/climate.py @@ -7,7 +7,7 @@ CODEOWNERS = ["@glmnet"] coolix_ns = cg.esphome_ns.namespace("coolix") CoolixClimate = coolix_ns.class_("CoolixClimate", climate_ir.ClimateIR) -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(CoolixClimate) +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(CoolixClimate) async def to_code(config): diff --git a/esphome/components/daikin/climate.py b/esphome/components/daikin/climate.py index 2cd44969c1..7f0226143b 100644 --- a/esphome/components/daikin/climate.py +++ b/esphome/components/daikin/climate.py @@ -6,7 +6,7 @@ AUTO_LOAD = ["climate_ir"] daikin_ns = cg.esphome_ns.namespace("daikin") DaikinClimate = daikin_ns.class_("DaikinClimate", climate_ir.ClimateIR) -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(DaikinClimate) +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(DaikinClimate) async def to_code(config): diff --git a/esphome/components/daikin_arc/climate.py b/esphome/components/daikin_arc/climate.py index 8f6b07315d..dbaf12d959 100644 --- a/esphome/components/daikin_arc/climate.py +++ b/esphome/components/daikin_arc/climate.py @@ -6,7 +6,7 @@ AUTO_LOAD = ["climate_ir"] daikin_arc_ns = cg.esphome_ns.namespace("daikin_arc") DaikinArcClimate = daikin_arc_ns.class_("DaikinArcClimate", climate_ir.ClimateIR) -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(DaikinArcClimate) +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(DaikinArcClimate) async def to_code(config): diff --git a/esphome/components/daikin_brc/climate.py b/esphome/components/daikin_brc/climate.py index 1000784380..5b7a4631a9 100644 --- a/esphome/components/daikin_brc/climate.py +++ b/esphome/components/daikin_brc/climate.py @@ -9,7 +9,7 @@ daikin_brc_ns = cg.esphome_ns.namespace("daikin_brc") DaikinBrcClimate = daikin_brc_ns.class_("DaikinBrcClimate", climate_ir.ClimateIR) -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(DaikinBrcClimate).extend( +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(DaikinBrcClimate).extend( { cv.Optional(CONF_USE_FAHRENHEIT, default=False): cv.boolean, } diff --git a/esphome/components/delonghi/climate.py b/esphome/components/delonghi/climate.py index ff878b4ff7..63576f032d 100644 --- a/esphome/components/delonghi/climate.py +++ b/esphome/components/delonghi/climate.py @@ -6,7 +6,7 @@ AUTO_LOAD = ["climate_ir"] delonghi_ns = cg.esphome_ns.namespace("delonghi") DelonghiClimate = delonghi_ns.class_("DelonghiClimate", climate_ir.ClimateIR) -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(DelonghiClimate) +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(DelonghiClimate) async def to_code(config): diff --git a/esphome/components/emmeti/climate.py b/esphome/components/emmeti/climate.py index 042f1af64b..56e8e2b804 100644 --- a/esphome/components/emmeti/climate.py +++ b/esphome/components/emmeti/climate.py @@ -7,7 +7,7 @@ AUTO_LOAD = ["climate_ir"] emmeti_ns = cg.esphome_ns.namespace("emmeti") EmmetiClimate = emmeti_ns.class_("EmmetiClimate", climate_ir.ClimateIR) -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(EmmetiClimate) +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(EmmetiClimate) async def to_code(config): diff --git a/esphome/components/fujitsu_general/climate.py b/esphome/components/fujitsu_general/climate.py index 0f028d0af3..a104eafbcc 100644 --- a/esphome/components/fujitsu_general/climate.py +++ b/esphome/components/fujitsu_general/climate.py @@ -8,7 +8,7 @@ FujitsuGeneralClimate = fujitsu_general_ns.class_( "FujitsuGeneralClimate", climate_ir.ClimateIR ) -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(FujitsuGeneralClimate) +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(FujitsuGeneralClimate) async def to_code(config): diff --git a/esphome/components/gree/climate.py b/esphome/components/gree/climate.py index 947ef9bb97..057ba67b94 100644 --- a/esphome/components/gree/climate.py +++ b/esphome/components/gree/climate.py @@ -21,7 +21,7 @@ MODELS = { "yag": Model.GREE_YAG, } -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(GreeClimate).extend( +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(GreeClimate).extend( { cv.Required(CONF_MODEL): cv.enum(MODELS), } diff --git a/esphome/components/heatpumpir/climate.py b/esphome/components/heatpumpir/climate.py index 21b0168615..c0eb8db4b3 100644 --- a/esphome/components/heatpumpir/climate.py +++ b/esphome/components/heatpumpir/climate.py @@ -97,7 +97,7 @@ VERTICAL_DIRECTIONS = { } CONFIG_SCHEMA = cv.All( - climate_ir.climare_ir_with_receiver_schema(HeatpumpIRClimate).extend( + climate_ir.climate_ir_with_receiver_schema(HeatpumpIRClimate).extend( { cv.Required(CONF_PROTOCOL): cv.enum(PROTOCOLS), cv.Required(CONF_HORIZONTAL_DEFAULT): cv.enum(HORIZONTAL_DIRECTIONS), diff --git a/esphome/components/hitachi_ac344/climate.py b/esphome/components/hitachi_ac344/climate.py index 4fa2d54fbb..ebdf4e8db4 100644 --- a/esphome/components/hitachi_ac344/climate.py +++ b/esphome/components/hitachi_ac344/climate.py @@ -6,7 +6,7 @@ AUTO_LOAD = ["climate_ir"] hitachi_ac344_ns = cg.esphome_ns.namespace("hitachi_ac344") HitachiClimate = hitachi_ac344_ns.class_("HitachiClimate", climate_ir.ClimateIR) -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(HitachiClimate) +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(HitachiClimate) async def to_code(config): diff --git a/esphome/components/hitachi_ac424/climate.py b/esphome/components/hitachi_ac424/climate.py index 4b20147922..fde4e77545 100644 --- a/esphome/components/hitachi_ac424/climate.py +++ b/esphome/components/hitachi_ac424/climate.py @@ -6,7 +6,7 @@ AUTO_LOAD = ["climate_ir"] hitachi_ac424_ns = cg.esphome_ns.namespace("hitachi_ac424") HitachiClimate = hitachi_ac424_ns.class_("HitachiClimate", climate_ir.ClimateIR) -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(HitachiClimate) +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(HitachiClimate) async def to_code(config): diff --git a/esphome/components/midea_ir/climate.py b/esphome/components/midea_ir/climate.py index 5c9256b5e4..cbf5fae6fe 100644 --- a/esphome/components/midea_ir/climate.py +++ b/esphome/components/midea_ir/climate.py @@ -10,7 +10,7 @@ midea_ir_ns = cg.esphome_ns.namespace("midea_ir") MideaIR = midea_ir_ns.class_("MideaIR", climate_ir.ClimateIR) -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(MideaIR).extend( +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(MideaIR).extend( { cv.Optional(CONF_USE_FAHRENHEIT, default=False): cv.boolean, } diff --git a/esphome/components/mitsubishi/climate.py b/esphome/components/mitsubishi/climate.py index 5784d3ee8a..8291d70346 100644 --- a/esphome/components/mitsubishi/climate.py +++ b/esphome/components/mitsubishi/climate.py @@ -43,7 +43,7 @@ VERTICAL_DIRECTIONS = { } -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(MitsubishiClimate).extend( +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(MitsubishiClimate).extend( { cv.Optional(CONF_SET_FAN_MODE, default="3levels"): cv.enum(SETFANMODE), cv.Optional(CONF_SUPPORTS_DRY, default=False): cv.boolean, diff --git a/esphome/components/noblex/climate.py b/esphome/components/noblex/climate.py index d619265d01..19c4b6a08e 100644 --- a/esphome/components/noblex/climate.py +++ b/esphome/components/noblex/climate.py @@ -6,7 +6,7 @@ AUTO_LOAD = ["climate_ir"] noblex_ns = cg.esphome_ns.namespace("noblex") NoblexClimate = noblex_ns.class_("NoblexClimate", climate_ir.ClimateIR) -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(NoblexClimate) +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(NoblexClimate) async def to_code(config): diff --git a/esphome/components/tcl112/climate.py b/esphome/components/tcl112/climate.py index 9864113a52..58ed7ee529 100644 --- a/esphome/components/tcl112/climate.py +++ b/esphome/components/tcl112/climate.py @@ -7,7 +7,7 @@ CODEOWNERS = ["@glmnet"] tcl112_ns = cg.esphome_ns.namespace("tcl112") Tcl112Climate = tcl112_ns.class_("Tcl112Climate", climate_ir.ClimateIR) -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(Tcl112Climate) +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(Tcl112Climate) async def to_code(config): diff --git a/esphome/components/toshiba/climate.py b/esphome/components/toshiba/climate.py index 40112fc460..b8e390dd66 100644 --- a/esphome/components/toshiba/climate.py +++ b/esphome/components/toshiba/climate.py @@ -16,7 +16,7 @@ MODELS = { "RAC-PT1411HWRU-F": Model.MODEL_RAC_PT1411HWRU_F, } -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(ToshibaClimate).extend( +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(ToshibaClimate).extend( { cv.Optional(CONF_MODEL, default="generic"): cv.enum(MODELS, upper=True), } diff --git a/esphome/components/whirlpool/climate.py b/esphome/components/whirlpool/climate.py index daee9e7fb7..f969a505fb 100644 --- a/esphome/components/whirlpool/climate.py +++ b/esphome/components/whirlpool/climate.py @@ -15,7 +15,7 @@ MODELS = { "DG11J1-91": Model.MODEL_DG11J1_91, } -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(WhirlpoolClimate).extend( +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(WhirlpoolClimate).extend( { cv.Optional(CONF_MODEL, default="DG11J1-3A"): cv.enum(MODELS, upper=True), } diff --git a/esphome/components/whynter/climate.py b/esphome/components/whynter/climate.py index 4a01c014c7..bf33890d9c 100644 --- a/esphome/components/whynter/climate.py +++ b/esphome/components/whynter/climate.py @@ -9,7 +9,7 @@ whynter_ns = cg.esphome_ns.namespace("whynter") Whynter = whynter_ns.class_("Whynter", climate_ir.ClimateIR) -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(Whynter).extend( +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(Whynter).extend( { cv.Optional(CONF_USE_FAHRENHEIT, default=False): cv.boolean, } diff --git a/esphome/components/zhlt01/climate.py b/esphome/components/zhlt01/climate.py index d5098ab42c..8d0c50308b 100644 --- a/esphome/components/zhlt01/climate.py +++ b/esphome/components/zhlt01/climate.py @@ -7,7 +7,7 @@ CODEOWNERS = ["@cfeenstra1024"] zhlt01_ns = cg.esphome_ns.namespace("zhlt01") ZHLT01Climate = zhlt01_ns.class_("ZHLT01Climate", climate_ir.ClimateIR) -CONFIG_SCHEMA = climate_ir.climare_ir_with_receiver_schema(ZHLT01Climate) +CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(ZHLT01Climate) async def to_code(config): From e47741d47174bca80b531a2b6ffd6017951cfcb9 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sun, 18 May 2025 15:43:41 -0400 Subject: [PATCH 09/16] Fix ESP32 console logging corruption and message loss in multi-task (#8806) --- esphome/components/logger/logger.cpp | 44 +++++++++++++++++++--------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/esphome/components/logger/logger.cpp b/esphome/components/logger/logger.cpp index 0ad909cb07..014f7e3dec 100644 --- a/esphome/components/logger/logger.cpp +++ b/esphome/components/logger/logger.cpp @@ -16,9 +16,14 @@ static const char *const TAG = "logger"; #ifdef USE_ESP32 // Implementation for ESP32 (multi-task platform with task-specific tracking) // Main task always uses direct buffer access for console output and callbacks -// Other tasks: -// - With task log buffer: stack buffer for console output, async buffer for callbacks -// - Without task log buffer: only console output, no callbacks +// +// For non-main tasks: +// - WITH task log buffer: Prefer sending to ring buffer for async processing +// - Avoids allocating stack memory for console output in normal operation +// - Prevents console corruption from concurrent writes by multiple tasks +// - Messages are serialized through main loop for proper console output +// - Fallback to emergency console logging only if ring buffer is full +// - WITHOUT task log buffer: Only emergency console output, no callbacks void HOT Logger::log_vprintf_(int level, const char *tag, int line, const char *format, va_list args) { // NOLINT if (level > this->level_for(tag)) return; @@ -38,8 +43,18 @@ void HOT Logger::log_vprintf_(int level, const char *tag, int line, const char * return; } - // For non-main tasks: use stack-allocated buffer only for console output - if (this->baud_rate_ > 0) { // If logging is enabled, write to console + bool message_sent = false; +#ifdef USE_ESPHOME_TASK_LOG_BUFFER + // For non-main tasks, queue the message for callbacks - but only if we have any callbacks registered + message_sent = this->log_buffer_->send_message_thread_safe(static_cast(level), tag, + static_cast(line), current_task, format, args); +#endif // USE_ESPHOME_TASK_LOG_BUFFER + + // Emergency console logging for non-main tasks when ring buffer is full or disabled + // This is a fallback mechanism to ensure critical log messages are visible + // Note: This may cause interleaved/corrupted console output if multiple tasks + // log simultaneously, but it's better than losing important messages entirely + if (!message_sent && this->baud_rate_ > 0) { // If logging is enabled, write to console // Maximum size for console log messages (includes null terminator) static const size_t MAX_CONSOLE_LOG_MSG_SIZE = 144; char console_buffer[MAX_CONSOLE_LOG_MSG_SIZE]; // MUST be stack allocated for thread safety @@ -49,15 +64,6 @@ void HOT Logger::log_vprintf_(int level, const char *tag, int line, const char * this->write_msg_(console_buffer); } -#ifdef USE_ESPHOME_TASK_LOG_BUFFER - // For non-main tasks, queue the message for callbacks - but only if we have any callbacks registered - if (this->log_callback_.size() > 0) { - // This will be processed in the main loop - this->log_buffer_->send_message_thread_safe(static_cast(level), tag, static_cast(line), - current_task, format, args); - } -#endif // USE_ESPHOME_TASK_LOG_BUFFER - // Reset the recursion guard for this task this->reset_task_log_recursion_(is_main_task); } @@ -184,7 +190,17 @@ void Logger::loop() { this->write_footer_to_buffer_(this->tx_buffer_, &this->tx_buffer_at_, this->tx_buffer_size_); this->tx_buffer_[this->tx_buffer_at_] = '\0'; this->call_log_callbacks_(message->level, message->tag, this->tx_buffer_); + // At this point all the data we need from message has been transferred to the tx_buffer + // so we can release the message to allow other tasks to use it as soon as possible. this->log_buffer_->release_message_main_loop(received_token); + + // Write to console from the main loop to prevent corruption from concurrent writes + // This ensures all log messages appear on the console in a clean, serialized manner + // Note: Messages may appear slightly out of order due to async processing, but + // this is preferred over corrupted/interleaved console output + if (this->baud_rate_ > 0) { + this->write_msg_(this->tx_buffer_); + } } } #endif From 574aabdedec80ca20dec5a54439a9ad649bf8cb4 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sun, 18 May 2025 15:48:57 -0400 Subject: [PATCH 10/16] Reduce number of calls to fetch time in the main loop (#8804) --- esphome/components/api/api_connection.cpp | 5 +-- esphome/components/bedjet/bedjet_hub.cpp | 1 + .../bluetooth_proxy/bluetooth_proxy.cpp | 3 +- esphome/components/cse7766/cse7766.cpp | 3 +- .../current_based/current_based_cover.cpp | 3 +- esphome/components/daly_bms/daly_bms.cpp | 3 +- esphome/components/debug/debug_component.cpp | 2 +- esphome/components/endstop/endstop_cover.cpp | 3 +- .../components/esp32_ble/ble_advertising.cpp | 3 +- .../components/esp32_camera/esp32_camera.cpp | 3 +- .../esp32_improv/esp32_improv_component.cpp | 2 +- .../components/esp32_touch/esp32_touch.cpp | 2 +- .../ethernet/ethernet_component.cpp | 2 +- .../components/feedback/feedback_cover.cpp | 3 +- esphome/components/gcja5/gcja5.cpp | 3 +- .../growatt_solar/growatt_solar.cpp | 3 +- esphome/components/kuntze/kuntze.cpp | 3 +- .../matrix_keypad/matrix_keypad.cpp | 3 +- .../components/max7219digit/max7219digit.cpp | 3 +- esphome/components/modbus/modbus.cpp | 3 +- esphome/components/mqtt/mqtt_client.cpp | 2 +- esphome/components/pmsx003/pmsx003.cpp | 3 +- esphome/components/pzem004t/pzem004t.cpp | 3 +- esphome/components/rf_bridge/rf_bridge.cpp | 3 +- esphome/components/sds011/sds011.cpp | 3 +- .../components/slow_pwm/slow_pwm_output.cpp | 3 +- esphome/components/sprinkler/sprinkler.cpp | 11 ++++--- .../time_based/time_based_cover.cpp | 3 +- .../components/uart/switch/uart_switch.cpp | 3 +- .../climate/uponor_smatrix_climate.cpp | 3 +- .../uponor_smatrix/uponor_smatrix.cpp | 3 +- esphome/core/application.cpp | 32 +++++++++++++------ esphome/core/application.h | 6 +++- esphome/core/component.cpp | 15 ++++++--- esphome/core/component.h | 6 +++- esphome/core/scheduler.cpp | 5 ++- 36 files changed, 107 insertions(+), 53 deletions(-) diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp index c377909951..1c945b200f 100644 --- a/esphome/components/api/api_connection.cpp +++ b/esphome/components/api/api_connection.cpp @@ -8,6 +8,7 @@ #include "esphome/core/hal.h" #include "esphome/core/log.h" #include "esphome/core/version.h" +#include "esphome/core/application.h" #ifdef USE_DEEP_SLEEP #include "esphome/components/deep_sleep/deep_sleep_component.h" @@ -146,7 +147,7 @@ void APIConnection::loop() { } return; } else { - this->last_traffic_ = millis(); + this->last_traffic_ = App.get_loop_component_start_time(); // read a packet this->read_message(buffer.data_len, buffer.type, &buffer.container[buffer.data_offset]); if (this->remove_) @@ -165,7 +166,7 @@ void APIConnection::loop() { static uint32_t keepalive = 60000; static uint8_t max_ping_retries = 60; static uint16_t ping_retry_interval = 1000; - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); if (this->sent_ping_) { // Disconnect if not responded within 2.5*keepalive if (now - this->last_traffic_ > (keepalive * 5) / 2) { diff --git a/esphome/components/bedjet/bedjet_hub.cpp b/esphome/components/bedjet/bedjet_hub.cpp index 6404298697..fea7080de6 100644 --- a/esphome/components/bedjet/bedjet_hub.cpp +++ b/esphome/components/bedjet/bedjet_hub.cpp @@ -3,6 +3,7 @@ #include "bedjet_hub.h" #include "bedjet_child.h" #include "bedjet_const.h" +#include "esphome/core/application.h" #include namespace esphome { diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp index 915d2882d3..d8b2111cb0 100644 --- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp +++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp @@ -2,6 +2,7 @@ #include "esphome/core/log.h" #include "esphome/core/macros.h" +#include "esphome/core/application.h" #ifdef USE_ESP32 @@ -177,7 +178,7 @@ void BluetoothProxy::loop() { // Flush any pending BLE advertisements that have been accumulated but not yet sent if (this->raw_advertisements_) { static uint32_t last_flush_time = 0; - uint32_t now = millis(); + uint32_t now = App.get_loop_component_start_time(); // Flush accumulated advertisements every 100ms if (now - last_flush_time >= 100) { diff --git a/esphome/components/cse7766/cse7766.cpp b/esphome/components/cse7766/cse7766.cpp index 88a91e374a..b0876778a3 100644 --- a/esphome/components/cse7766/cse7766.cpp +++ b/esphome/components/cse7766/cse7766.cpp @@ -1,5 +1,6 @@ #include "cse7766.h" #include "esphome/core/log.h" +#include "esphome/core/application.h" namespace esphome { namespace cse7766 { @@ -7,7 +8,7 @@ namespace cse7766 { static const char *const TAG = "cse7766"; void CSE7766Component::loop() { - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); if (now - this->last_transmission_ >= 500) { // last transmission too long ago. Reset RX index. this->raw_data_index_ = 0; diff --git a/esphome/components/current_based/current_based_cover.cpp b/esphome/components/current_based/current_based_cover.cpp index 8404e07894..8bb27dbeca 100644 --- a/esphome/components/current_based/current_based_cover.cpp +++ b/esphome/components/current_based/current_based_cover.cpp @@ -1,6 +1,7 @@ #include "current_based_cover.h" #include "esphome/core/hal.h" #include "esphome/core/log.h" +#include "esphome/core/application.h" #include namespace esphome { @@ -60,7 +61,7 @@ void CurrentBasedCover::loop() { if (this->current_operation == COVER_OPERATION_IDLE) return; - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); if (this->current_operation == COVER_OPERATION_OPENING) { if (this->malfunction_detection_ && this->is_closing_()) { // Malfunction diff --git a/esphome/components/daly_bms/daly_bms.cpp b/esphome/components/daly_bms/daly_bms.cpp index 929f31e008..1dd0520465 100644 --- a/esphome/components/daly_bms/daly_bms.cpp +++ b/esphome/components/daly_bms/daly_bms.cpp @@ -1,6 +1,7 @@ #include "daly_bms.h" #include #include "esphome/core/log.h" +#include "esphome/core/application.h" namespace esphome { namespace daly_bms { @@ -32,7 +33,7 @@ void DalyBmsComponent::update() { } void DalyBmsComponent::loop() { - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); if (this->receiving_ && (now - this->last_transmission_ >= 200)) { // last transmission too long ago. Reset RX index. ESP_LOGW(TAG, "Last transmission too long ago. Reset RX index."); diff --git a/esphome/components/debug/debug_component.cpp b/esphome/components/debug/debug_component.cpp index 5bcc676247..c4de42c7e9 100644 --- a/esphome/components/debug/debug_component.cpp +++ b/esphome/components/debug/debug_component.cpp @@ -70,7 +70,7 @@ void DebugComponent::loop() { #ifdef USE_SENSOR // calculate loop time - from last call to this one if (this->loop_time_sensor_ != nullptr) { - uint32_t now = millis(); + uint32_t now = App.get_loop_component_start_time(); uint32_t loop_time = now - this->last_loop_timetag_; this->max_loop_time_ = std::max(this->max_loop_time_, loop_time); this->last_loop_timetag_ = now; diff --git a/esphome/components/endstop/endstop_cover.cpp b/esphome/components/endstop/endstop_cover.cpp index 1190acc46b..381f098eb5 100644 --- a/esphome/components/endstop/endstop_cover.cpp +++ b/esphome/components/endstop/endstop_cover.cpp @@ -1,6 +1,7 @@ #include "endstop_cover.h" #include "esphome/core/log.h" #include "esphome/core/hal.h" +#include "esphome/core/application.h" namespace esphome { namespace endstop { @@ -65,7 +66,7 @@ void EndstopCover::loop() { if (this->current_operation == COVER_OPERATION_IDLE) return; - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); if (this->current_operation == COVER_OPERATION_OPENING && this->is_open_()) { float dur = (now - this->start_dir_time_) / 1e3f; diff --git a/esphome/components/esp32_ble/ble_advertising.cpp b/esphome/components/esp32_ble/ble_advertising.cpp index 1d340c76d9..8d43b5af33 100644 --- a/esphome/components/esp32_ble/ble_advertising.cpp +++ b/esphome/components/esp32_ble/ble_advertising.cpp @@ -6,6 +6,7 @@ #include #include "ble_uuid.h" #include "esphome/core/log.h" +#include "esphome/core/application.h" namespace esphome { namespace esp32_ble { @@ -143,7 +144,7 @@ void BLEAdvertising::loop() { if (this->raw_advertisements_callbacks_.empty()) { return; } - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); if (now - this->last_advertisement_time_ > this->advertising_cycle_time_) { this->stop(); this->current_adv_index_ += 1; diff --git a/esphome/components/esp32_camera/esp32_camera.cpp b/esphome/components/esp32_camera/esp32_camera.cpp index e9e9d3cffb..60accba747 100644 --- a/esphome/components/esp32_camera/esp32_camera.cpp +++ b/esphome/components/esp32_camera/esp32_camera.cpp @@ -3,6 +3,7 @@ #include "esp32_camera.h" #include "esphome/core/log.h" #include "esphome/core/hal.h" +#include "esphome/core/application.h" #include @@ -162,7 +163,7 @@ void ESP32Camera::loop() { } // request idle image every idle_update_interval - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); if (this->idle_update_interval_ != 0 && now - this->last_idle_request_ > this->idle_update_interval_) { this->last_idle_request_ = now; this->request_image(IDLE); diff --git a/esphome/components/esp32_improv/esp32_improv_component.cpp b/esphome/components/esp32_improv/esp32_improv_component.cpp index b720425506..d74714838f 100644 --- a/esphome/components/esp32_improv/esp32_improv_component.cpp +++ b/esphome/components/esp32_improv/esp32_improv_component.cpp @@ -92,7 +92,7 @@ void ESP32ImprovComponent::loop() { if (!this->incoming_data_.empty()) this->process_incoming_data_(); - uint32_t now = millis(); + uint32_t now = App.get_loop_component_start_time(); switch (this->state_) { case improv::STATE_STOPPED: diff --git a/esphome/components/esp32_touch/esp32_touch.cpp b/esphome/components/esp32_touch/esp32_touch.cpp index 69e4e37cec..1dcb39e5de 100644 --- a/esphome/components/esp32_touch/esp32_touch.cpp +++ b/esphome/components/esp32_touch/esp32_touch.cpp @@ -288,7 +288,7 @@ uint32_t ESP32TouchComponent::component_touch_pad_read(touch_pad_t tp) { } void ESP32TouchComponent::loop() { - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); bool should_print = this->setup_mode_ && now - this->setup_mode_last_log_print_ > 250; for (auto *child : this->children_) { child->value_ = this->component_touch_pad_read(child->get_touch_pad()); diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp index 68a6e617fc..79ef0715d8 100644 --- a/esphome/components/ethernet/ethernet_component.cpp +++ b/esphome/components/ethernet/ethernet_component.cpp @@ -240,7 +240,7 @@ void EthernetComponent::setup() { } void EthernetComponent::loop() { - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); switch (this->state_) { case EthernetComponentState::STOPPED: diff --git a/esphome/components/feedback/feedback_cover.cpp b/esphome/components/feedback/feedback_cover.cpp index fa3166ba65..e419ee6229 100644 --- a/esphome/components/feedback/feedback_cover.cpp +++ b/esphome/components/feedback/feedback_cover.cpp @@ -1,6 +1,7 @@ #include "feedback_cover.h" #include "esphome/core/hal.h" #include "esphome/core/log.h" +#include "esphome/core/application.h" namespace esphome { namespace feedback { @@ -220,7 +221,7 @@ void FeedbackCover::set_open_obstacle_sensor(binary_sensor::BinarySensor *open_o void FeedbackCover::loop() { if (this->current_operation == COVER_OPERATION_IDLE) return; - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); // Recompute position every loop cycle this->recompute_position_(); diff --git a/esphome/components/gcja5/gcja5.cpp b/esphome/components/gcja5/gcja5.cpp index b1db58654b..64b237515b 100644 --- a/esphome/components/gcja5/gcja5.cpp +++ b/esphome/components/gcja5/gcja5.cpp @@ -6,6 +6,7 @@ */ #include "gcja5.h" #include "esphome/core/log.h" +#include "esphome/core/application.h" #include namespace esphome { @@ -16,7 +17,7 @@ static const char *const TAG = "gcja5"; void GCJA5Component::setup() { ESP_LOGCONFIG(TAG, "Setting up gcja5..."); } void GCJA5Component::loop() { - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); if (now - this->last_transmission_ >= 500) { // last transmission too long ago. Reset RX index. this->rx_message_.clear(); diff --git a/esphome/components/growatt_solar/growatt_solar.cpp b/esphome/components/growatt_solar/growatt_solar.cpp index c4ed5ab841..60fd1379e8 100644 --- a/esphome/components/growatt_solar/growatt_solar.cpp +++ b/esphome/components/growatt_solar/growatt_solar.cpp @@ -1,5 +1,6 @@ #include "growatt_solar.h" #include "esphome/core/log.h" +#include "esphome/core/application.h" namespace esphome { namespace growatt_solar { @@ -18,7 +19,7 @@ void GrowattSolar::loop() { void GrowattSolar::update() { // If our last send has had no reply yet, and it wasn't that long ago, do nothing. - uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); if (now - this->last_send_ < this->get_update_interval() / 2) { return; } diff --git a/esphome/components/kuntze/kuntze.cpp b/esphome/components/kuntze/kuntze.cpp index e50dafca86..8ab7af8cd9 100644 --- a/esphome/components/kuntze/kuntze.cpp +++ b/esphome/components/kuntze/kuntze.cpp @@ -1,5 +1,6 @@ #include "kuntze.h" #include "esphome/core/log.h" +#include "esphome/core/application.h" namespace esphome { namespace kuntze { @@ -60,7 +61,7 @@ void Kuntze::on_modbus_data(const std::vector &data) { } void Kuntze::loop() { - uint32_t now = millis(); + uint32_t now = App.get_loop_component_start_time(); // timeout after 15 seconds if (this->waiting_ && (now - this->last_send_ > 15000)) { ESP_LOGW(TAG, "timed out waiting for response"); diff --git a/esphome/components/matrix_keypad/matrix_keypad.cpp b/esphome/components/matrix_keypad/matrix_keypad.cpp index 8537997935..6cb4fc4f3c 100644 --- a/esphome/components/matrix_keypad/matrix_keypad.cpp +++ b/esphome/components/matrix_keypad/matrix_keypad.cpp @@ -1,5 +1,6 @@ #include "matrix_keypad.h" #include "esphome/core/log.h" +#include "esphome/core/application.h" namespace esphome { namespace matrix_keypad { @@ -28,7 +29,7 @@ void MatrixKeypad::setup() { void MatrixKeypad::loop() { static uint32_t active_start = 0; static int active_key = -1; - uint32_t now = millis(); + uint32_t now = App.get_loop_component_start_time(); int key = -1; bool error = false; int pos = 0, row, col; diff --git a/esphome/components/max7219digit/max7219digit.cpp b/esphome/components/max7219digit/max7219digit.cpp index 13b75ca734..154accd66f 100644 --- a/esphome/components/max7219digit/max7219digit.cpp +++ b/esphome/components/max7219digit/max7219digit.cpp @@ -2,6 +2,7 @@ #include "esphome/core/log.h" #include "esphome/core/helpers.h" #include "esphome/core/hal.h" +#include "esphome/core/application.h" #include "max7219font.h" #include @@ -63,7 +64,7 @@ void MAX7219Component::dump_config() { } void MAX7219Component::loop() { - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); const uint32_t millis_since_last_scroll = now - this->last_scroll_; const size_t first_line_size = this->max_displaybuffer_[0].size(); // check if the buffer has shrunk past the current position since last update diff --git a/esphome/components/modbus/modbus.cpp b/esphome/components/modbus/modbus.cpp index 47deea83e6..80c2ffe3d6 100644 --- a/esphome/components/modbus/modbus.cpp +++ b/esphome/components/modbus/modbus.cpp @@ -1,6 +1,7 @@ #include "modbus.h" #include "esphome/core/log.h" #include "esphome/core/helpers.h" +#include "esphome/core/application.h" namespace esphome { namespace modbus { @@ -13,7 +14,7 @@ void Modbus::setup() { } } void Modbus::loop() { - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); while (this->available()) { uint8_t byte; diff --git a/esphome/components/mqtt/mqtt_client.cpp b/esphome/components/mqtt/mqtt_client.cpp index 1fcef3293c..e3722099a7 100644 --- a/esphome/components/mqtt/mqtt_client.cpp +++ b/esphome/components/mqtt/mqtt_client.cpp @@ -345,7 +345,7 @@ void MQTTClientComponent::loop() { this->disconnect_reason_.reset(); } - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); switch (this->state_) { case MQTT_CLIENT_DISABLED: diff --git a/esphome/components/pmsx003/pmsx003.cpp b/esphome/components/pmsx003/pmsx003.cpp index 11626768d8..0abed8a5a4 100644 --- a/esphome/components/pmsx003/pmsx003.cpp +++ b/esphome/components/pmsx003/pmsx003.cpp @@ -1,5 +1,6 @@ #include "pmsx003.h" #include "esphome/core/log.h" +#include "esphome/core/application.h" namespace esphome { namespace pmsx003 { @@ -42,7 +43,7 @@ void PMSX003Component::dump_config() { } void PMSX003Component::loop() { - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); // If we update less often than it takes the device to stabilise, spin the fan down // rather than running it constantly. It does take some time to stabilise, so we diff --git a/esphome/components/pzem004t/pzem004t.cpp b/esphome/components/pzem004t/pzem004t.cpp index 35b66b03f2..356847825e 100644 --- a/esphome/components/pzem004t/pzem004t.cpp +++ b/esphome/components/pzem004t/pzem004t.cpp @@ -1,5 +1,6 @@ #include "pzem004t.h" #include "esphome/core/log.h" +#include "esphome/core/application.h" #include namespace esphome { @@ -16,7 +17,7 @@ void PZEM004T::setup() { } void PZEM004T::loop() { - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); if (now - this->last_read_ > 500 && this->available() < 7) { while (this->available()) this->read(); diff --git a/esphome/components/rf_bridge/rf_bridge.cpp b/esphome/components/rf_bridge/rf_bridge.cpp index 3b3e00a416..52ce037dbe 100644 --- a/esphome/components/rf_bridge/rf_bridge.cpp +++ b/esphome/components/rf_bridge/rf_bridge.cpp @@ -1,5 +1,6 @@ #include "rf_bridge.h" #include "esphome/core/log.h" +#include "esphome/core/application.h" #include #include @@ -128,7 +129,7 @@ void RFBridgeComponent::write_byte_str_(const std::string &codes) { } void RFBridgeComponent::loop() { - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); if (now - this->last_bridge_byte_ > 50) { this->rx_buffer_.clear(); this->last_bridge_byte_ = now; diff --git a/esphome/components/sds011/sds011.cpp b/esphome/components/sds011/sds011.cpp index 0c04ff557f..a34059d85d 100644 --- a/esphome/components/sds011/sds011.cpp +++ b/esphome/components/sds011/sds011.cpp @@ -1,5 +1,6 @@ #include "sds011.h" #include "esphome/core/log.h" +#include "esphome/core/application.h" namespace esphome { namespace sds011 { @@ -75,7 +76,7 @@ void SDS011Component::dump_config() { } void SDS011Component::loop() { - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); if ((now - this->last_transmission_ >= 500) && this->data_index_) { // last transmission too long ago. Reset RX index. ESP_LOGV(TAG, "Last transmission too long ago. Reset RX index."); diff --git a/esphome/components/slow_pwm/slow_pwm_output.cpp b/esphome/components/slow_pwm/slow_pwm_output.cpp index d6b2cdfe12..643294303c 100644 --- a/esphome/components/slow_pwm/slow_pwm_output.cpp +++ b/esphome/components/slow_pwm/slow_pwm_output.cpp @@ -1,5 +1,6 @@ #include "slow_pwm_output.h" #include "esphome/core/log.h" +#include "esphome/core/application.h" namespace esphome { namespace slow_pwm { @@ -39,7 +40,7 @@ void SlowPWMOutput::set_output_state_(bool new_state) { } void SlowPWMOutput::loop() { - uint32_t now = millis(); + uint32_t now = App.get_loop_component_start_time(); float scaled_state = this->state_ * this->period_; if (now - this->period_start_time_ >= this->period_) { diff --git a/esphome/components/sprinkler/sprinkler.cpp b/esphome/components/sprinkler/sprinkler.cpp index 3cfb5ccdee..50ea3eff51 100644 --- a/esphome/components/sprinkler/sprinkler.cpp +++ b/esphome/components/sprinkler/sprinkler.cpp @@ -20,7 +20,7 @@ SprinklerSwitch::SprinklerSwitch(switch_::Switch *off_switch, switch_::Switch *o bool SprinklerSwitch::is_latching_valve() { return (this->off_switch_ != nullptr) && (this->on_switch_ != nullptr); } void SprinklerSwitch::loop() { - if ((this->pinned_millis_) && (millis() > this->pinned_millis_ + this->pulse_duration_)) { + if ((this->pinned_millis_) && (App.get_loop_component_start_time() > this->pinned_millis_ + this->pulse_duration_)) { this->pinned_millis_ = 0; // reset tracker if (this->off_switch_->state) { this->off_switch_->turn_off(); @@ -148,22 +148,23 @@ SprinklerValveOperator::SprinklerValveOperator(SprinklerValve *valve, Sprinkler : controller_(controller), valve_(valve) {} void SprinklerValveOperator::loop() { - if (millis() >= this->start_millis_) { // dummy check + uint32_t now = App.get_loop_component_start_time(); + if (now >= this->start_millis_) { // dummy check switch (this->state_) { case STARTING: - if (millis() > (this->start_millis_ + this->start_delay_)) { + if (now > (this->start_millis_ + this->start_delay_)) { this->run_(); // start_delay_ has been exceeded, so ensure both valves are on and update the state } break; case ACTIVE: - if (millis() > (this->start_millis_ + this->start_delay_ + this->run_duration_)) { + if (now > (this->start_millis_ + this->start_delay_ + this->run_duration_)) { this->stop(); // start_delay_ + run_duration_ has been exceeded, start shutting down } break; case STOPPING: - if (millis() > (this->stop_millis_ + this->stop_delay_)) { + if (now > (this->stop_millis_ + this->stop_delay_)) { this->kill_(); // stop_delay_has been exceeded, ensure all valves are off } break; diff --git a/esphome/components/time_based/time_based_cover.cpp b/esphome/components/time_based/time_based_cover.cpp index e1936d5ee1..ec219d6db7 100644 --- a/esphome/components/time_based/time_based_cover.cpp +++ b/esphome/components/time_based/time_based_cover.cpp @@ -1,6 +1,7 @@ #include "time_based_cover.h" #include "esphome/core/log.h" #include "esphome/core/hal.h" +#include "esphome/core/application.h" namespace esphome { namespace time_based { @@ -26,7 +27,7 @@ void TimeBasedCover::loop() { if (this->current_operation == COVER_OPERATION_IDLE) return; - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); // Recompute position every loop cycle this->recompute_position_(); diff --git a/esphome/components/uart/switch/uart_switch.cpp b/esphome/components/uart/switch/uart_switch.cpp index 1edb54641b..96f50ff50f 100644 --- a/esphome/components/uart/switch/uart_switch.cpp +++ b/esphome/components/uart/switch/uart_switch.cpp @@ -1,5 +1,6 @@ #include "uart_switch.h" #include "esphome/core/log.h" +#include "esphome/core/application.h" namespace esphome { namespace uart { @@ -8,7 +9,7 @@ static const char *const TAG = "uart.switch"; void UARTSwitch::loop() { if (this->send_every_) { - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); if (now - this->last_transmission_ > this->send_every_) { this->write_command_(this->state); this->last_transmission_ = now; diff --git a/esphome/components/uponor_smatrix/climate/uponor_smatrix_climate.cpp b/esphome/components/uponor_smatrix/climate/uponor_smatrix_climate.cpp index 5afc628db3..cc9b8a0f90 100644 --- a/esphome/components/uponor_smatrix/climate/uponor_smatrix_climate.cpp +++ b/esphome/components/uponor_smatrix/climate/uponor_smatrix_climate.cpp @@ -1,6 +1,7 @@ #include "uponor_smatrix_climate.h" #include "esphome/core/helpers.h" #include "esphome/core/log.h" +#include "esphome/core/application.h" namespace esphome { namespace uponor_smatrix { @@ -13,7 +14,7 @@ void UponorSmatrixClimate::dump_config() { } void UponorSmatrixClimate::loop() { - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); // Publish state after all update packets are processed if (this->last_data_ != 0 && (now - this->last_data_ > 100) && this->target_temperature_raw_ != 0) { diff --git a/esphome/components/uponor_smatrix/uponor_smatrix.cpp b/esphome/components/uponor_smatrix/uponor_smatrix.cpp index e058de2852..2dbbef72ab 100644 --- a/esphome/components/uponor_smatrix/uponor_smatrix.cpp +++ b/esphome/components/uponor_smatrix/uponor_smatrix.cpp @@ -1,5 +1,6 @@ #include "uponor_smatrix.h" #include "esphome/core/log.h" +#include "esphome/core/application.h" namespace esphome { namespace uponor_smatrix { @@ -35,7 +36,7 @@ void UponorSmatrixComponent::dump_config() { } void UponorSmatrixComponent::loop() { - const uint32_t now = millis(); + const uint32_t now = App.get_loop_component_start_time(); // Discard stale data if (!this->rx_buffer_.empty() && (now - this->last_rx_ > 50)) { diff --git a/esphome/core/application.cpp b/esphome/core/application.cpp index 3f5a283fd8..a81a2c580c 100644 --- a/esphome/core/application.cpp +++ b/esphome/core/application.cpp @@ -67,22 +67,32 @@ void Application::loop() { uint32_t new_app_state = 0; this->scheduler.call(); - this->feed_wdt(); + + // Get the initial loop time at the start + uint32_t last_op_end_time = millis(); + + // Feed WDT with time + this->feed_wdt(last_op_end_time); + for (Component *component : this->looping_components_) { + // Update the cached time before each component runs + this->loop_component_start_time_ = last_op_end_time; + { this->set_current_component(component); - WarnIfComponentBlockingGuard guard{component}; + WarnIfComponentBlockingGuard guard{component, last_op_end_time}; component->call(); + // Use the finish method to get the current time as the end time + last_op_end_time = guard.finish(); } new_app_state |= component->get_component_state(); this->app_state_ |= new_app_state; - this->feed_wdt(); + this->feed_wdt(last_op_end_time); } this->app_state_ = new_app_state; - const uint32_t now = millis(); - - auto elapsed = now - this->last_loop_; + // Use the last component's end time instead of calling millis() again + auto elapsed = last_op_end_time - this->last_loop_; if (elapsed >= this->loop_interval_ || HighFrequencyLoopRequester::is_high_frequency()) { yield(); } else { @@ -94,7 +104,7 @@ void Application::loop() { delay_time = std::min(next_schedule, delay_time); delay(delay_time); } - this->last_loop_ = now; + this->last_loop_ = last_op_end_time; if (this->dump_config_at_ < this->components_.size()) { if (this->dump_config_at_ == 0) { @@ -109,10 +119,12 @@ void Application::loop() { } } -void IRAM_ATTR HOT Application::feed_wdt() { +void IRAM_ATTR HOT Application::feed_wdt(uint32_t time) { static uint32_t last_feed = 0; - uint32_t now = micros(); - if (now - last_feed > 3000) { + // Use provided time if available, otherwise get current time + uint32_t now = time ? time : millis(); + // Compare in milliseconds (3ms threshold) + if (now - last_feed > 3) { arch_feed_wdt(); last_feed = now; #ifdef USE_STATUS_LED diff --git a/esphome/core/application.h b/esphome/core/application.h index e64e2b7655..aa44d9ba1d 100644 --- a/esphome/core/application.h +++ b/esphome/core/application.h @@ -217,6 +217,9 @@ class Application { std::string get_compilation_time() const { return this->compilation_time_; } + /// Get the cached time in milliseconds from when the current component started its loop execution + inline uint32_t IRAM_ATTR HOT get_loop_component_start_time() const { return this->loop_component_start_time_; } + /** Set the target interval with which to run the loop() calls. * If the loop() method takes longer than the target interval, ESPHome won't * sleep in loop(), but if the time spent in loop() is small than the target, ESPHome @@ -236,7 +239,7 @@ class Application { void schedule_dump_config() { this->dump_config_at_ = 0; } - void feed_wdt(); + void feed_wdt(uint32_t time = 0); void reboot(); @@ -551,6 +554,7 @@ class Application { size_t dump_config_at_{SIZE_MAX}; uint32_t app_state_{0}; Component *current_component_{nullptr}; + uint32_t loop_component_start_time_{0}; }; /// Global storage of Application pointer - only one Application can exist. diff --git a/esphome/core/component.cpp b/esphome/core/component.cpp index a7e451b93d..1141e4067d 100644 --- a/esphome/core/component.cpp +++ b/esphome/core/component.cpp @@ -240,10 +240,12 @@ void PollingComponent::stop_poller() { uint32_t PollingComponent::get_update_interval() const { return this->update_interval_; } void PollingComponent::set_update_interval(uint32_t update_interval) { this->update_interval_ = update_interval; } -WarnIfComponentBlockingGuard::WarnIfComponentBlockingGuard(Component *component) - : started_(millis()), component_(component) {} -WarnIfComponentBlockingGuard::~WarnIfComponentBlockingGuard() { - uint32_t blocking_time = millis() - this->started_; +WarnIfComponentBlockingGuard::WarnIfComponentBlockingGuard(Component *component, uint32_t start_time) + : started_(start_time), component_(component) {} +uint32_t WarnIfComponentBlockingGuard::finish() { + uint32_t curr_time = millis(); + + uint32_t blocking_time = curr_time - this->started_; bool should_warn; if (this->component_ != nullptr) { should_warn = this->component_->should_warn_of_blocking(blocking_time); @@ -254,8 +256,11 @@ WarnIfComponentBlockingGuard::~WarnIfComponentBlockingGuard() { const char *src = component_ == nullptr ? "" : component_->get_component_source(); ESP_LOGW(TAG, "Component %s took a long time for an operation (%" PRIu32 " ms).", src, blocking_time); ESP_LOGW(TAG, "Components should block for at most 30 ms."); - ; } + + return curr_time; } +WarnIfComponentBlockingGuard::~WarnIfComponentBlockingGuard() {} + } // namespace esphome diff --git a/esphome/core/component.h b/esphome/core/component.h index 412074282d..7b3e12eb59 100644 --- a/esphome/core/component.h +++ b/esphome/core/component.h @@ -339,7 +339,11 @@ class PollingComponent : public Component { class WarnIfComponentBlockingGuard { public: - WarnIfComponentBlockingGuard(Component *component); + WarnIfComponentBlockingGuard(Component *component, uint32_t start_time); + + // Finish the timing operation and return the current time + uint32_t finish(); + ~WarnIfComponentBlockingGuard(); protected: diff --git a/esphome/core/scheduler.cpp b/esphome/core/scheduler.cpp index b4f617d405..2dea450ead 100644 --- a/esphome/core/scheduler.cpp +++ b/esphome/core/scheduler.cpp @@ -229,8 +229,11 @@ void HOT Scheduler::call() { // - timeouts/intervals get added, potentially invalidating vector pointers // - timeouts/intervals get cancelled { - WarnIfComponentBlockingGuard guard{item->component}; + uint32_t now_ms = millis(); + WarnIfComponentBlockingGuard guard{item->component, now_ms}; item->callback(); + // Call finish to ensure blocking time is properly calculated and reported + guard.finish(); } } From b0c1e0e28ce8633de259a02bd9a1c9ec7b87e1c9 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sun, 18 May 2025 17:05:20 -0400 Subject: [PATCH 11/16] Refactor API frame helpers to enable buffer reuse (#8825) --- esphome/components/api/api_connection.cpp | 2 +- esphome/components/api/api_connection.h | 9 +- esphome/components/api/api_frame_helper.cpp | 128 ++++++++++++++------ esphome/components/api/api_frame_helper.h | 41 ++++++- esphome/components/api/proto.h | 28 +++++ 5 files changed, 162 insertions(+), 46 deletions(-) diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp index 1c945b200f..b7db88e6ba 100644 --- a/esphome/components/api/api_connection.cpp +++ b/esphome/components/api/api_connection.cpp @@ -1645,7 +1645,7 @@ bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint32_t message_type) return false; } - APIError err = this->helper_->write_packet(message_type, buffer.get_buffer()->data(), buffer.get_buffer()->size()); + APIError err = this->helper_->write_protobuf_packet(message_type, buffer); if (err == APIError::WOULD_BLOCK) return false; if (err != APIError::OK) { diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h index dd24802e72..e8a29b9c7f 100644 --- a/esphome/components/api/api_connection.h +++ b/esphome/components/api/api_connection.h @@ -405,7 +405,14 @@ class APIConnection : public APIServerConnection { ProtoWriteBuffer create_buffer(uint32_t reserve_size) override { // FIXME: ensure no recursive writes can happen this->proto_write_buffer_.clear(); - this->proto_write_buffer_.reserve(reserve_size); + // Get header padding size - used for both reserve and insert + uint8_t header_padding = this->helper_->frame_header_padding(); + // Reserve space for header padding + message + footer + // - Header padding: space for protocol headers (7 bytes for Noise, 6 for Plaintext) + // - Footer: space for MAC (16 bytes for Noise, 0 for Plaintext) + this->proto_write_buffer_.reserve(reserve_size + header_padding + this->helper_->frame_footer_size()); + // Insert header padding bytes so message encoding starts at the correct position + this->proto_write_buffer_.insert(this->proto_write_buffer_.begin(), header_padding, 0); return {&this->proto_write_buffer_}; } bool try_to_clear_buffer(bool log_out_of_space); diff --git a/esphome/components/api/api_frame_helper.cpp b/esphome/components/api/api_frame_helper.cpp index f251ceb6e4..f18f4104b6 100644 --- a/esphome/components/api/api_frame_helper.cpp +++ b/esphome/components/api/api_frame_helper.cpp @@ -493,9 +493,12 @@ void APINoiseFrameHelper::send_explicit_handshake_reject_(const std::string &rea std::vector data; data.resize(reason.length() + 1); data[0] = 0x01; // failure - for (size_t i = 0; i < reason.length(); i++) { - data[i + 1] = (uint8_t) reason[i]; + + // Copy error message in bulk + if (!reason.empty()) { + std::memcpy(data.data() + 1, reason.c_str(), reason.length()); } + // temporarily remove failed state auto orig_state = state_; state_ = State::EXPLICIT_REJECT; @@ -557,7 +560,7 @@ APIError APINoiseFrameHelper::read_packet(ReadPacketBuffer *buffer) { return APIError::OK; } bool APINoiseFrameHelper::can_write_without_blocking() { return state_ == State::DATA && tx_buf_.empty(); } -APIError APINoiseFrameHelper::write_packet(uint16_t type, const uint8_t *payload, size_t payload_len) { +APIError APINoiseFrameHelper::write_protobuf_packet(uint16_t type, ProtoWriteBuffer buffer) { int err; APIError aerr; aerr = state_action_(); @@ -569,31 +572,36 @@ APIError APINoiseFrameHelper::write_packet(uint16_t type, const uint8_t *payload return APIError::WOULD_BLOCK; } + std::vector *raw_buffer = buffer.get_buffer(); + // Message data starts after padding + size_t payload_len = raw_buffer->size() - frame_header_padding_; size_t padding = 0; size_t msg_len = 4 + payload_len + padding; - size_t frame_len = 3 + msg_len + noise_cipherstate_get_mac_length(send_cipher_); - auto tmpbuf = std::unique_ptr{new (std::nothrow) uint8_t[frame_len]}; - if (tmpbuf == nullptr) { - HELPER_LOG("Could not allocate for writing packet"); - return APIError::OUT_OF_MEMORY; - } - tmpbuf[0] = 0x01; // indicator - // tmpbuf[1], tmpbuf[2] to be set later + // We need to resize to include MAC space, but we already reserved it in create_buffer + raw_buffer->resize(raw_buffer->size() + frame_footer_size_); + + // Write the noise header in the padded area + // Buffer layout: + // [0] - 0x01 indicator byte + // [1-2] - Size of encrypted payload (filled after encryption) + // [3-4] - Message type (encrypted) + // [5-6] - Payload length (encrypted) + // [7...] - Actual payload data (encrypted) + uint8_t *buf_start = raw_buffer->data(); + buf_start[0] = 0x01; // indicator + // buf_start[1], buf_start[2] to be set later after encryption const uint8_t msg_offset = 3; - const uint8_t payload_offset = msg_offset + 4; - tmpbuf[msg_offset + 0] = (uint8_t) (type >> 8); // type - tmpbuf[msg_offset + 1] = (uint8_t) type; - tmpbuf[msg_offset + 2] = (uint8_t) (payload_len >> 8); // data_len - tmpbuf[msg_offset + 3] = (uint8_t) payload_len; - // copy data - std::copy(payload, payload + payload_len, &tmpbuf[payload_offset]); - // fill padding with zeros - std::fill(&tmpbuf[payload_offset + payload_len], &tmpbuf[frame_len], 0); + buf_start[msg_offset + 0] = (uint8_t) (type >> 8); // type high byte + buf_start[msg_offset + 1] = (uint8_t) type; // type low byte + buf_start[msg_offset + 2] = (uint8_t) (payload_len >> 8); // data_len high byte + buf_start[msg_offset + 3] = (uint8_t) payload_len; // data_len low byte + // payload data is already in the buffer starting at position 7 NoiseBuffer mbuf; noise_buffer_init(mbuf); - noise_buffer_set_inout(mbuf, &tmpbuf[msg_offset], msg_len, frame_len - msg_offset); + // The capacity parameter should be msg_len + frame_footer_size_ (MAC length) to allow space for encryption + noise_buffer_set_inout(mbuf, buf_start + msg_offset, msg_len, msg_len + frame_footer_size_); err = noise_cipherstate_encrypt(send_cipher_, &mbuf); if (err != 0) { state_ = State::FAILED; @@ -602,11 +610,13 @@ APIError APINoiseFrameHelper::write_packet(uint16_t type, const uint8_t *payload } size_t total_len = 3 + mbuf.size; - tmpbuf[1] = (uint8_t) (mbuf.size >> 8); - tmpbuf[2] = (uint8_t) mbuf.size; + buf_start[1] = (uint8_t) (mbuf.size >> 8); + buf_start[2] = (uint8_t) mbuf.size; struct iovec iov; - iov.iov_base = &tmpbuf[0]; + // Point iov_base to the beginning of the buffer (no unused padding in Noise) + // We send the entire frame: indicator + size + encrypted(type + data_len + payload + MAC) + iov.iov_base = buf_start; iov.iov_len = total_len; // write raw to not have two packets sent if NAGLE disabled @@ -718,6 +728,8 @@ APIError APINoiseFrameHelper::check_handshake_finished_() { return APIError::HANDSHAKESTATE_SPLIT_FAILED; } + frame_footer_size_ = noise_cipherstate_get_mac_length(send_cipher_); + HELPER_LOG("Handshake complete!"); noise_handshakestate_free(handshake_); handshake_ = nullptr; @@ -990,28 +1002,66 @@ APIError APIPlaintextFrameHelper::read_packet(ReadPacketBuffer *buffer) { return APIError::OK; } bool APIPlaintextFrameHelper::can_write_without_blocking() { return state_ == State::DATA && tx_buf_.empty(); } -APIError APIPlaintextFrameHelper::write_packet(uint16_t type, const uint8_t *payload, size_t payload_len) { +APIError APIPlaintextFrameHelper::write_protobuf_packet(uint16_t type, ProtoWriteBuffer buffer) { if (state_ != State::DATA) { return APIError::BAD_STATE; } - std::vector header; - header.reserve(1 + api::ProtoSize::varint(static_cast(payload_len)) + - api::ProtoSize::varint(static_cast(type))); - header.push_back(0x00); - ProtoVarInt(payload_len).encode(header); - ProtoVarInt(type).encode(header); + std::vector *raw_buffer = buffer.get_buffer(); + // Message data starts after padding (frame_header_padding_ = 6) + size_t payload_len = raw_buffer->size() - frame_header_padding_; - struct iovec iov[2]; - iov[0].iov_base = &header[0]; - iov[0].iov_len = header.size(); - if (payload_len == 0) { - return write_raw_(iov, 1); + // Calculate varint sizes for header components + size_t size_varint_len = api::ProtoSize::varint(static_cast(payload_len)); + size_t type_varint_len = api::ProtoSize::varint(static_cast(type)); + size_t total_header_len = 1 + size_varint_len + type_varint_len; + + if (total_header_len > frame_header_padding_) { + // Header is too large to fit in the padding + return APIError::BAD_ARG; } - iov[1].iov_base = const_cast(payload); - iov[1].iov_len = payload_len; - return write_raw_(iov, 2); + // Calculate where to start writing the header + // The header starts at the latest possible position to minimize unused padding + // + // Example 1 (small values): total_header_len = 3, header_offset = 6 - 3 = 3 + // [0-2] - Unused padding + // [3] - 0x00 indicator byte + // [4] - Payload size varint (1 byte, for sizes 0-127) + // [5] - Message type varint (1 byte, for types 0-127) + // [6...] - Actual payload data + // + // Example 2 (medium values): total_header_len = 4, header_offset = 6 - 4 = 2 + // [0-1] - Unused padding + // [2] - 0x00 indicator byte + // [3-4] - Payload size varint (2 bytes, for sizes 128-16383) + // [5] - Message type varint (1 byte, for types 0-127) + // [6...] - Actual payload data + // + // Example 3 (large values): total_header_len = 6, header_offset = 6 - 6 = 0 + // [0] - 0x00 indicator byte + // [1-3] - Payload size varint (3 bytes, for sizes 16384-2097151) + // [4-5] - Message type varint (2 bytes, for types 128-32767) + // [6...] - Actual payload data + uint8_t *buf_start = raw_buffer->data(); + size_t header_offset = frame_header_padding_ - total_header_len; + + // Write the plaintext header + buf_start[header_offset] = 0x00; // indicator + + // Encode size varint directly into buffer + ProtoVarInt(payload_len).encode_to_buffer_unchecked(buf_start + header_offset + 1, size_varint_len); + + // Encode type varint directly into buffer + ProtoVarInt(type).encode_to_buffer_unchecked(buf_start + header_offset + 1 + size_varint_len, type_varint_len); + + struct iovec iov; + // Point iov_base to the beginning of our header (skip unused padding) + // This ensures we only send the actual header and payload, not the empty padding bytes + iov.iov_base = buf_start + header_offset; + iov.iov_len = total_header_len + payload_len; + + return write_raw_(&iov, 1); } APIError APIPlaintextFrameHelper::try_send_tx_buf_() { // try send from tx_buf diff --git a/esphome/components/api/api_frame_helper.h b/esphome/components/api/api_frame_helper.h index db506ea1ce..25bfd594ec 100644 --- a/esphome/components/api/api_frame_helper.h +++ b/esphome/components/api/api_frame_helper.h @@ -16,6 +16,8 @@ namespace esphome { namespace api { +class ProtoWriteBuffer; + struct ReadPacketBuffer { std::vector container; uint16_t type; @@ -65,32 +67,46 @@ class APIFrameHelper { virtual APIError loop() = 0; virtual APIError read_packet(ReadPacketBuffer *buffer) = 0; virtual bool can_write_without_blocking() = 0; - virtual APIError write_packet(uint16_t type, const uint8_t *data, size_t len) = 0; + virtual APIError write_protobuf_packet(uint16_t type, ProtoWriteBuffer buffer) = 0; virtual std::string getpeername() = 0; virtual int getpeername(struct sockaddr *addr, socklen_t *addrlen) = 0; virtual APIError close() = 0; virtual APIError shutdown(int how) = 0; // Give this helper a name for logging virtual void set_log_info(std::string info) = 0; + // Get the frame header padding required by this protocol + virtual uint8_t frame_header_padding() = 0; + // Get the frame footer size required by this protocol + virtual uint8_t frame_footer_size() = 0; protected: // Common implementation for writing raw data to socket template APIError write_raw_(const struct iovec *iov, int iovcnt, socket::Socket *socket, std::vector &tx_buf, const std::string &info, StateEnum &state, StateEnum failed_state); + + uint8_t frame_header_padding_{0}; + uint8_t frame_footer_size_{0}; }; #ifdef USE_API_NOISE class APINoiseFrameHelper : public APIFrameHelper { public: APINoiseFrameHelper(std::unique_ptr socket, std::shared_ptr ctx) - : socket_(std::move(socket)), ctx_(std::move(std::move(ctx))) {} + : socket_(std::move(socket)), ctx_(std::move(ctx)) { + // Noise header structure: + // Pos 0: indicator (0x01) + // Pos 1-2: encrypted payload size (16-bit big-endian) + // Pos 3-6: encrypted type (16-bit) + data_len (16-bit) + // Pos 7+: actual payload data + frame_header_padding_ = 7; + } ~APINoiseFrameHelper() override; APIError init() override; APIError loop() override; APIError read_packet(ReadPacketBuffer *buffer) override; bool can_write_without_blocking() override; - APIError write_packet(uint16_t type, const uint8_t *payload, size_t len) override; + APIError write_protobuf_packet(uint16_t type, ProtoWriteBuffer buffer) override; std::string getpeername() override { return this->socket_->getpeername(); } int getpeername(struct sockaddr *addr, socklen_t *addrlen) override { return this->socket_->getpeername(addr, addrlen); @@ -99,6 +115,10 @@ class APINoiseFrameHelper : public APIFrameHelper { APIError shutdown(int how) override; // Give this helper a name for logging void set_log_info(std::string info) override { info_ = std::move(info); } + // Get the frame header padding required by this protocol + uint8_t frame_header_padding() override { return frame_header_padding_; } + // Get the frame footer size required by this protocol + uint8_t frame_footer_size() override { return frame_footer_size_; } protected: struct ParsedFrame { @@ -152,13 +172,20 @@ class APINoiseFrameHelper : public APIFrameHelper { #ifdef USE_API_PLAINTEXT class APIPlaintextFrameHelper : public APIFrameHelper { public: - APIPlaintextFrameHelper(std::unique_ptr socket) : socket_(std::move(socket)) {} + APIPlaintextFrameHelper(std::unique_ptr socket) : socket_(std::move(socket)) { + // Plaintext header structure (worst case): + // Pos 0: indicator (0x00) + // Pos 1-3: payload size varint (up to 3 bytes) + // Pos 4-5: message type varint (up to 2 bytes) + // Pos 6+: actual payload data + frame_header_padding_ = 6; + } ~APIPlaintextFrameHelper() override = default; APIError init() override; APIError loop() override; APIError read_packet(ReadPacketBuffer *buffer) override; bool can_write_without_blocking() override; - APIError write_packet(uint16_t type, const uint8_t *payload, size_t len) override; + APIError write_protobuf_packet(uint16_t type, ProtoWriteBuffer buffer) override; std::string getpeername() override { return this->socket_->getpeername(); } int getpeername(struct sockaddr *addr, socklen_t *addrlen) override { return this->socket_->getpeername(addr, addrlen); @@ -167,6 +194,10 @@ class APIPlaintextFrameHelper : public APIFrameHelper { APIError shutdown(int how) override; // Give this helper a name for logging void set_log_info(std::string info) override { info_ = std::move(info); } + // Get the frame header padding required by this protocol + uint8_t frame_header_padding() override { return frame_header_padding_; } + // Get the frame footer size required by this protocol + uint8_t frame_footer_size() override { return frame_footer_size_; } protected: struct ParsedFrame { diff --git a/esphome/components/api/proto.h b/esphome/components/api/proto.h index e110a58eda..65bef0b6f7 100644 --- a/esphome/components/api/proto.h +++ b/esphome/components/api/proto.h @@ -83,6 +83,34 @@ class ProtoVarInt { return static_cast(this->value_ >> 1); } } + /** + * Encode the varint value to a pre-allocated buffer without bounds checking. + * + * @param buffer The pre-allocated buffer to write the encoded varint to + * @param len The size of the buffer in bytes + * + * @note The caller is responsible for ensuring the buffer is large enough + * to hold the encoded value. Use ProtoSize::varint() to calculate + * the exact size needed before calling this method. + * @note No bounds checking is performed for performance reasons. + */ + void encode_to_buffer_unchecked(uint8_t *buffer, size_t len) { + uint64_t val = this->value_; + if (val <= 0x7F) { + buffer[0] = val; + return; + } + size_t i = 0; + while (val && i < len) { + uint8_t temp = val & 0x7F; + val >>= 7; + if (val) { + buffer[i++] = temp | 0x80; + } else { + buffer[i++] = temp; + } + } + } void encode(std::vector &out) { uint64_t val = this->value_; if (val <= 0x7F) { From 24fbe602dd4c888a2db53ead21d42f1b2878321e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 09:13:20 +1200 Subject: [PATCH 12/16] Bump codecov/codecov-action from 5.4.2 to 5.4.3 (#8820) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8d2ec68010..4913e8ee19 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -221,7 +221,7 @@ jobs: . venv/bin/activate pytest -vv --cov-report=xml --tb=native tests - name: Upload coverage to Codecov - uses: codecov/codecov-action@v5.4.2 + uses: codecov/codecov-action@v5.4.3 with: token: ${{ secrets.CODECOV_TOKEN }} From 660030d1573cb281698fec95c55f8f471613c382 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 09:20:29 +1200 Subject: [PATCH 13/16] Bump docker/build-push-action from 6.16.0 to 6.17.0 in /.github/actions/build-image (#8810) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/actions/build-image/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/build-image/action.yaml b/.github/actions/build-image/action.yaml index 3d6de54f42..0e41314ce6 100644 --- a/.github/actions/build-image/action.yaml +++ b/.github/actions/build-image/action.yaml @@ -47,7 +47,7 @@ runs: - name: Build and push to ghcr by digest id: build-ghcr - uses: docker/build-push-action@v6.16.0 + uses: docker/build-push-action@v6.17.0 env: DOCKER_BUILD_SUMMARY: false DOCKER_BUILD_RECORD_UPLOAD: false @@ -73,7 +73,7 @@ runs: - name: Build and push to dockerhub by digest id: build-dockerhub - uses: docker/build-push-action@v6.16.0 + uses: docker/build-push-action@v6.17.0 env: DOCKER_BUILD_SUMMARY: false DOCKER_BUILD_RECORD_UPLOAD: false From dbce54477a2b6238510d09776482eb688f61c79f Mon Sep 17 00:00:00 2001 From: Thomas Rupprecht Date: Sun, 18 May 2025 23:44:33 +0200 Subject: [PATCH 14/16] unify and add missing metric suffixes (#8816) --- esphome/config_validation.py | 43 ++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/esphome/config_validation.py b/esphome/config_validation.py index 2eabcc8568..54056240ce 100644 --- a/esphome/config_validation.py +++ b/esphome/config_validation.py @@ -982,23 +982,32 @@ def uuid(value): METRIC_SUFFIXES = { - "E": 1e18, - "P": 1e15, - "T": 1e12, - "G": 1e9, - "M": 1e6, - "k": 1e3, - "da": 10, - "d": 1e-1, - "c": 1e-2, - "m": 0.001, - "µ": 1e-6, - "u": 1e-6, - "n": 1e-9, - "p": 1e-12, - "f": 1e-15, - "a": 1e-18, - "": 1, + "Q": 1e30, # Quetta + "R": 1e27, # Ronna + "Y": 1e24, # Yotta + "Z": 1e21, # Zetta + "E": 1e18, # Exa + "P": 1e15, # Peta + "T": 1e12, # Tera + "G": 1e9, # Giga + "M": 1e6, # Mega + "k": 1e3, # Kilo + "h": 1e2, # Hecto + "da": 1e1, # Deca + "": 1e0, # No prefix + "d": 1e-1, # Deci + "c": 1e-2, # Centi + "m": 1e-3, # Milli + "µ": 1e-6, # Micro + "u": 1e-6, # Micro (same as µ) + "n": 1e-9, # Nano + "p": 1e-12, # Pico + "f": 1e-15, # Femto + "a": 1e-18, # Atto + "z": 1e-21, # Zepto + "y": 1e-24, # Yocto + "r": 1e-27, # Ronto + "q": 1e-30, # Quecto } From 87a9dd18c8213c95c5c76aba913934f1b11b661e Mon Sep 17 00:00:00 2001 From: DanielV Date: Mon, 19 May 2025 00:01:30 +0200 Subject: [PATCH 15/16] Improve stability for a test that crashes intermittently in CI (#8699) Co-authored-by: NP v/d Spek --- tests/dashboard/test_web_server.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/dashboard/test_web_server.py b/tests/dashboard/test_web_server.py index a61850abf3..1ea9c73f32 100644 --- a/tests/dashboard/test_web_server.py +++ b/tests/dashboard/test_web_server.py @@ -75,6 +75,7 @@ async def test_devices_page(dashboard: DashboardTestHelper) -> None: assert response.headers["content-type"] == "application/json" json_data = json.loads(response.body.decode()) configured_devices = json_data["configured"] + assert len(configured_devices) != 0 first_device = configured_devices[0] assert first_device["name"] == "pico" assert first_device["configuration"] == "pico.yaml" From 99c4f88c3f3ac43575638340ef267518173ccf8c Mon Sep 17 00:00:00 2001 From: Fexiven <48439988+Fexiven@users.noreply.github.com> Date: Mon, 19 May 2025 01:01:31 +0200 Subject: [PATCH 16/16] Update esp32-camera library version (#8832) --- esphome/components/esp32_camera/__init__.py | 2 +- esphome/components/esp32_camera/esp32_camera.cpp | 9 --------- esphome/idf_component.yml | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/esphome/components/esp32_camera/__init__.py b/esphome/components/esp32_camera/__init__.py index e55c54f097..b4038c1841 100644 --- a/esphome/components/esp32_camera/__init__.py +++ b/esphome/components/esp32_camera/__init__.py @@ -296,7 +296,7 @@ async def to_code(config): add_idf_component( name="esp32-camera", repo="https://github.com/espressif/esp32-camera.git", - ref="v2.0.9", + ref="v2.0.15", ) for conf in config.get(CONF_ON_STREAM_START, []): diff --git a/esphome/components/esp32_camera/esp32_camera.cpp b/esphome/components/esp32_camera/esp32_camera.cpp index 60accba747..cfcf7869d4 100644 --- a/esphome/components/esp32_camera/esp32_camera.cpp +++ b/esphome/components/esp32_camera/esp32_camera.cpp @@ -55,11 +55,7 @@ void ESP32Camera::dump_config() { ESP_LOGCONFIG(TAG, " HREF Pin: %d", conf.pin_href); ESP_LOGCONFIG(TAG, " Pixel Clock Pin: %d", conf.pin_pclk); ESP_LOGCONFIG(TAG, " External Clock: Pin:%d Frequency:%u", conf.pin_xclk, conf.xclk_freq_hz); -#ifdef USE_ESP_IDF // Temporary until the espressif/esp32-camera library is updated - ESP_LOGCONFIG(TAG, " I2C Pins: SDA:%d SCL:%d", conf.pin_sscb_sda, conf.pin_sscb_scl); -#else ESP_LOGCONFIG(TAG, " I2C Pins: SDA:%d SCL:%d", conf.pin_sccb_sda, conf.pin_sccb_scl); -#endif ESP_LOGCONFIG(TAG, " Reset Pin: %d", conf.pin_reset); switch (this->config_.frame_size) { case FRAMESIZE_QQVGA: @@ -239,13 +235,8 @@ void ESP32Camera::set_external_clock(uint8_t pin, uint32_t frequency) { this->config_.xclk_freq_hz = frequency; } void ESP32Camera::set_i2c_pins(uint8_t sda, uint8_t scl) { -#ifdef USE_ESP_IDF // Temporary until the espressif/esp32-camera library is updated - this->config_.pin_sscb_sda = sda; - this->config_.pin_sscb_scl = scl; -#else this->config_.pin_sccb_sda = sda; this->config_.pin_sccb_scl = scl; -#endif } void ESP32Camera::set_reset_pin(uint8_t pin) { this->config_.pin_reset = pin; } void ESP32Camera::set_power_down_pin(uint8_t pin) { this->config_.pin_pwdn = pin; } diff --git a/esphome/idf_component.yml b/esphome/idf_component.yml index c273cae07e..8460de5638 100644 --- a/esphome/idf_component.yml +++ b/esphome/idf_component.yml @@ -4,7 +4,7 @@ dependencies: version: v1.3.1 esp32_camera: git: https://github.com/espressif/esp32-camera.git - version: v2.0.9 + version: v2.0.15 mdns: git: https://github.com/espressif/esp-protocols.git version: mdns-v1.8.2