Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
.vscode
node_modules/
build/web/*
.idea
.idea
*.code-workspace
.gitignore
20 changes: 19 additions & 1 deletion src/SplitFlapMqtt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ void SplitFlapMqtt::connectToMqtt() {
// clang-format on

mqttClient.subscribe(topic_command.c_str());
mqttClient.publish(topic_avail.c_str(), "online", true);
setAvailable(); // publish availability status

mqttClient.publish(topic_state.c_str(), "", true);

mqttClient.publish(topic_config_text.c_str(), payload_text.c_str(), true);
Expand All @@ -101,8 +102,25 @@ void SplitFlapMqtt::publishState(const String &message) {
mqttClient.publish(topic_state.c_str(), message.c_str(), true);
}

void SplitFlapMqtt::setAvailable() {
mqttClient.publish(topic_avail.c_str(), "online", true);
}

void SplitFlapMqtt::loop() {
mqttClient.loop();
// Check if MQTT client is connected, if not try to reconnect
if (! mqttClient.connected()) {
unsigned long now = millis();
if (now - lastAttempt > 5000) { // retry every 5 seconds
connectToMqtt();
lastAttempt = now;
}
}
// Publish availability status every 60 seconds
if (millis() - lastAvailabilityPublish > 60000) {
setAvailable();
lastAvailabilityPublish = millis();
}
}

bool SplitFlapMqtt::isConnected() {
Expand Down
2 changes: 2 additions & 0 deletions src/SplitFlapMqtt.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class SplitFlapMqtt {
void setup();
void loop(); // needed for PubSubClient3
void publishState(const String &message);
void setAvailable(); // publish availability status
void setDisplay(SplitFlapDisplay *display);
bool isConnected();

Expand All @@ -37,5 +38,6 @@ class SplitFlapMqtt {
String topic_config_sensor;

unsigned long lastAttempt = 0;
unsigned long lastAvailabilityPublish = 0;
int retryCount = 0;
};