libraries/ha-mqtt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use a better name for restoreStateFrom...

Browse Source
This commit is contained in:
Nicu Hodos 2025-10-10 23:28:01 +02:00
parent 149a722fc7
commit 130f4eb6a2
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ha.h
View File

@ -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;
}
};