jeka/OTGateway
1
0
Fork 0
mirror of https://github.com/Laxilef/OTGateway.git synced 2025-12-12 11:14:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

small fix

Browse Source
This commit is contained in:
Yurii
2023-12-14 06:00:09 +03:00
parent 38889bb59d
commit e13984f869
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/MqttTask.h
View File

@@ -26,19 +26,18 @@ public:
} }
protected: protected:
WiFiClient* wifiClient; WiFiClient* wifiClient = nullptr;
PubSubClient* client = nullptr; PubSubClient* client = nullptr;
HaHelper* haHelper = nullptr; HaHelper* haHelper = nullptr;
unsigned short readyForSendTime = 15000;
unsigned long lastReconnectTime = 0; unsigned long lastReconnectTime = 0;
unsigned long connectedTime = 0; unsigned long connectedTime = 0;
unsigned long disconnectedTime = 0; unsigned long disconnectedTime = 0;
unsigned long prevPubVars = 0; unsigned long prevPubVarsTime = 0;
unsigned long prevPubSettings = 0; unsigned long prevPubSettingsTime = 0;
bool connected = false; bool connected = false;
bool newConnection = false; bool newConnection = false;
unsigned short readyForSendTime = 15000;
const char* getTaskName() { const char* getTaskName() {
return "Mqtt"; return "Mqtt";
} }
@@ -90,6 +89,7 @@ protected:
// memory leak at random times if this is not done // memory leak at random times if this is not done
if (this->wifiClient != nullptr) { if (this->wifiClient != nullptr) {
delete this->wifiClient; delete this->wifiClient;
this->wifiClient = nullptr;
} }
this->wifiClient = new WiFiClient(); this->wifiClient = new WiFiClient();
@@ -131,7 +131,7 @@ protected:
} }
// publish variables and status // publish variables and status
if (this->newConnection || millis() - this->prevPubVars > settings.mqtt.interval) { if (this->newConnection || millis() - this->prevPubVarsTime > settings.mqtt.interval) {
this->client->publish( this->client->publish(
this->getTopicPath("status").c_str(), this->getTopicPath("status").c_str(),
!vars.states.otStatus ? "offline" : vars.states.fault ? "fault" : "online" !vars.states.otStatus ? "offline" : vars.states.fault ? "fault" : "online"
@@ -140,14 +140,14 @@ protected:
this->publishVariables(this->getTopicPath("state").c_str()); this->publishVariables(this->getTopicPath("state").c_str());
this->client->loop(); this->client->loop();
this->prevPubVars = millis(); this->prevPubVarsTime = millis();
} }
// publish settings // publish settings
if (this->newConnection || millis() - this->prevPubSettings > settings.mqtt.interval * 10) { if (this->newConnection || millis() - this->prevPubSettingsTime > settings.mqtt.interval * 10) {
this->publishSettings(this->getTopicPath("settings").c_str()); this->publishSettings(this->getTopicPath("settings").c_str());
this->client->loop(); this->client->loop();
this->prevPubSettings = millis(); this->prevPubSettingsTime = millis();
} }
// publish ha entities if not published // publish ha entities if not published
@@ -450,7 +450,7 @@ protected:
} }
if (flag) { if (flag) {
this->prevPubSettings = 0; this->prevPubSettingsTime = 0;
eeSettings.update(); eeSettings.update();
return true; return true;
} }
@@ -504,7 +504,7 @@ protected:
} }
if (flag) { if (flag) {
this->prevPubVars = 0; this->prevPubVarsTime = 0;
return true; return true;
} }