From 130f4eb6a2ea9ceadbdc988deedd5774e375dac9 Mon Sep 17 00:00:00 2001 From: Nicu Hodos Date: Fri, 10 Oct 2025 23:28:01 +0200 Subject: [PATCH] use a better name for restoreStateFrom... --- src/ha.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ha.h b/src/ha.h index 4ed1409..d89a6be 100644 --- a/src/ha.h +++ b/src/ha.h @@ -186,27 +186,27 @@ namespace Ha { }; struct State : Config { - char stateTopic[TOPIC_SIZE] = {}; + char topic[TOPIC_SIZE] = {}; const char* jsonAttributesTemplate = nullptr; const char* valueTemplate = nullptr; State(Component* cmp) : cmp(cmp) {} void withStateTopic() { - snprintf(stateTopic, sizeof(stateTopic), BASE_TOPIC"/state", cmp->id); + snprintf(topic, sizeof(topic), BASE_TOPIC"/state", cmp->id); } void updateState(const char* message) { - if (stateTopic[0]) publisher(stateTopic, message); + if (topic[0]) publisher(topic, message); } protected: void buildConfig(JsonDocument& jsonDoc) override { - if (stateTopic[0]) { - jsonDoc["state_topic"] = (const char*)stateTopic; + if (topic[0]) { + jsonDoc["state_topic"] = (const char*)topic; if (jsonAttributesTemplate) { jsonDoc["json_attributes_template"] = jsonAttributesTemplate; - jsonDoc["json_attributes_topic"] = (const char*)stateTopic; + jsonDoc["json_attributes_topic"] = (const char*)topic; } if (valueTemplate) jsonDoc["value_template"] = valueTemplate; } @@ -220,9 +220,9 @@ namespace Ha { StatefulCommand(Component* cmp, onMessage f) : Command(cmp, f), State(cmp) {} - void restoreStateFromCommand() { + void restoreStateFromTopic() { withStateTopic(); - mapRestoreStateTopics.insert({stateTopic, this}); + mapRestoreStateTopics.insert({State::topic, this}); } protected: @@ -519,12 +519,12 @@ namespace Ha { [[deprecated("Use restoreStateFromCommand() instead")]] Builder& restoreFromState() { - cmp->restoreStateFromCommand(); + cmp->restoreStateFromTopic(); return *this; } - Builder& restoreStateFromCommand() { - cmp->restoreStateFromCommand(); + Builder& restoreStateFromTopic() { + cmp->restoreStateFromTopic(); return *this; } };