Skip to content

LevoitSwitch: set has_state on publish to match Select/Number behavior #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheDave94 wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −1
Open

LevoitSwitch: set has_state on publish to match Select/Number behavior #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions components/levoit/levoit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,13 @@ namespace esphome
auto *sw = switches_[st_idx_(type)];
if (!sw)
return;
// Flip has_state_ before the dedup early-return below: a
// decoder publish whose value matches the entity's default
// (false against default sw->state=false) would otherwise
// skip publish_state and leave has_state() returning false
// forever. See companion fix in LevoitSwitch::write_state
// for the rationale on why Switch needs this explicitly.
sw->set_has_state(true);
if (sw->state == state)
return;
sw->publish_state(state);
Expand Down
10 changes: 9 additions & 1 deletion components/levoit/switch/levoit_switch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,16 @@ namespace esphome
}
void LevoitSwitch::write_state(bool state)
{
// Optimistic update for HA UI
// Optimistic update for HA UI. Switch::publish_state in core
// ESPHome sets the public `state` field and fires callbacks but
// does not flip has_state_ — unlike Select::publish_state and
// Number::publish_state, which both call set_has_state(true).
// Set it explicitly so `if (entity->has_state())` guards in
// callers (e.g. command builders that distinguish "user just
// toggled this" from "never published") behave uniformly across
// switch / number / select.
this->publish_state(state);
this->set_has_state(true);

if (!parent_)
{
Expand Down