arduino/rc-gateway
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

unify execution of containers inside the list

Browse Source
This commit is contained in:
Nicu Hodos 2024-05-15 10:19:03 +02:00
parent ae525d7e15
commit 6a287007d7
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gateway/include/mqtt.h
View File

@ -45,12 +45,12 @@ namespace Mqtt {
(new PollinSwitch{"Train", "11111", 4, "Playroom"})->withStateTopic() (new PollinSwitch{"Train", "11111", 4, "Playroom"})->withStateTopic()
}; };
Ha::Sensor* sensors[] = { Sensor* sensors[] = {
OilTankRoomSensorBuilder::build("4"), OilTankRoomSensorBuilder::build("4"),
OilSensorBuilder::build("7") OilSensorBuilder::build("7")
}; };
void publishComponentConfig(Ha::Component& component) { void publishComponentConfig(Component& component) {
StaticJsonDocument<JSON_SIZE> jsonDoc; StaticJsonDocument<JSON_SIZE> jsonDoc;
component.buildConfig(jsonDoc); component.buildConfig(jsonDoc);
@ -60,18 +60,20 @@ namespace Mqtt {
publish(component.configTopic, message); publish(component.configTopic, message);
} }
void publishCleanupComponentConfig(Component& component) {
publish(component.configTopic, "");
}
void publishInit() { void publishInit() {
Ha::publisher = publish; Ha::publisher = publish;
for (List<Ha::Component>::Container* c = Ha::Component::components.first; c; c = c->next) { List<Component>::exec(Component::components, [](Component* c)
publishComponentConfig(*c->t); { publishComponentConfig(*c); });
}
ts.deleteTask(tPublishInit); ts.deleteTask(tPublishInit);
} }
void publishCleanupConfig() { void publishCleanupConfig() {
for (List<Ha::Component>::Container* c = Ha::Component::components.first; c; c = c->next) { List<Component>::exec(Component::components, [](Component* c)
publish(c->t->configTopic, ""); { publishCleanupComponentConfig(*c); });
}
} }
void onMessage(char* topic, char* payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total) { void onMessage(char* topic, char* payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total) {

6
gateway/include/utils.h
View File

@ -17,4 +17,10 @@ struct List {
last = c; last = c;
} }
static void exec(List list, void(*f)(T*)) {
for (List::Container *c = list.first; c; c = c->next) {
f(c->t);
}
}
}; };