github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-02 19:16:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[binary_sensor] Update state before firing callbacks in set_new_state

Browse Source 
Move set_has_state and set_state_value_ before callback invocations
so callback code can inspect the entity's current state via
get_state()/has_state(). The old state is passed as a parameter.

Addresses Copilot review feedback.
This commit is contained in:
J. Nick Koston
2026-03-22 16:13:35 -10:00
parent db3cfaa3fc
commit 1e2c5fbc4e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/core/entity_base.h
+5 -4
View File
@@ -352,15 +352,16 @@ template<typename T> class StatefulEntityBase : public EntityBase {
if (!had_state)
return false; // already invalidated, no change
}
// State changed — construct optionals only for callbacks that need them
// State changed — capture old state, then update storage before firing callbacks
// so callback code can inspect the entity's current state via get_state()/has_state()
optional<T> old_state = had_state ? optional<T>(this->get_state()) : nullopt;
this->full_state_callbacks_.call(old_state, new_state);
this->set_has_state(new_state.has_value());
if (new_state.has_value()) {
this->set_state_value_(new_state.value());
if (this->get_trigger_on_initial_state() || had_state)
this->state_callbacks_.call(new_state.value());
}
this->full_state_callbacks_.call(old_state, new_state);
if (new_state.has_value() && (this->get_trigger_on_initial_state() || had_state))
this->state_callbacks_.call(new_state.value());
return true;
}
/// Subclasses implement this to store the actual value into their own storage.