sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 23:21:54 +00:00
Code Issues Releases Wiki Activity

make sure components that disable in setup are disabled at start

Browse Source
This commit is contained in:
J. Nick Koston
2025-06-17 23:44:32 +02:00
parent 969abc3f29
commit d8a7e9abc8
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
esphome/core/application.cpp
View File

@@ -243,24 +243,22 @@ void Application::teardown_components(uint32_t timeout_ms) {
} }
void Application::calculate_looping_components_() { void Application::calculate_looping_components_() {
// First add all active components
for (auto *obj : this->components_) { for (auto *obj : this->components_) {
if (obj->has_overridden_loop()) { if (obj->has_overridden_loop() &&
(obj->get_component_state() & COMPONENT_STATE_MASK) != COMPONENT_STATE_LOOP_DONE) {
this->looping_components_.push_back(obj); this->looping_components_.push_back(obj);
} }
} }
// Partition components based on their current state this->looping_components_active_end_ = this->looping_components_.size();
// Components that have already called disable_loop() during setup (state == LOOP_DONE)
// should start in the inactive section of the partition // Then add all inactive (LOOP_DONE) components
this->looping_components_active_end_ = 0; // This handles components that called disable_loop() during setup, before this method runs
for (uint16_t i = 0; i < this->looping_components_.size(); i++) { for (auto *obj : this->components_) {
Component *comp = this->looping_components_[i]; if (obj->has_overridden_loop() &&
if ((comp->get_component_state() & COMPONENT_STATE_MASK) != COMPONENT_STATE_LOOP_DONE) { (obj->get_component_state() & COMPONENT_STATE_MASK) == COMPONENT_STATE_LOOP_DONE) {
// Component is active - swap it to the active section if needed this->looping_components_.push_back(obj);
if (i != this->looping_components_active_end_) {
std::swap(this->looping_components_[i], this->looping_components_[this->looping_components_active_end_]);
}
this->looping_components_active_end_++;
} }
} }
} }