Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Event send missing "mqtt_connected" at connection / error #514

Merged
merged 1 commit into from
Jan 15, 2023
Merged

Event send missing "mqtt_connected" at connection / error #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 44 additions & 29 deletions src/mqtt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ uint8_t overrideVersion = 0;

String lastWill = "";

int loop_timer = 0;

#ifndef MQTT_CONNECT_TIMEOUT
#define MQTT_CONNECT_TIMEOUT (5 * 1000)
#endif // !MQTT_CONNECT_TIMEOUT
Expand Down Expand Up @@ -221,6 +223,9 @@ mqtt_connect()
mqttclient.onError([](int err) {
DBUGF("MQTT error %d", err);
connecting = false;
DynamicJsonDocument doc(JSON_OBJECT_SIZE(1) + 60);
doc["mqtt_connected"] = 0;
event_send(doc);
});

String mqtt_host = mqtt_server + ":" + String(mqtt_port);
Expand Down Expand Up @@ -263,6 +268,11 @@ mqtt_connect()
DBUGVAR(announce);
mqttclient.publish(mqtt_announce_topic, announce, true);

doc.clear();

doc["mqtt_connected"] = 1;
event_send(doc);

// Publish MQTT override/claim
mqtt_publish_override();
mqtt_publish_claim();
Expand Down Expand Up @@ -392,7 +402,7 @@ mqtt_publish_claim() {
return;
}
bool hasclaim = evse.clientHasClaim(EvseClient_OpenEVSE_MQTT);
const size_t capacity = JSON_OBJECT_SIZE(40) + 1024;
const size_t capacity = JSON_OBJECT_SIZE(7) + 1024;
DynamicJsonDocument claimdata(capacity);
if(hasclaim) {
evse.serializeClaim(claimdata, EvseClient_OpenEVSE_MQTT);
Expand All @@ -410,7 +420,7 @@ mqtt_publish_override() {
if(!config_mqtt_enabled() || !mqttclient.connected()) {
return;
}
const size_t capacity = JSON_OBJECT_SIZE(40) + 1024;
const size_t capacity = JSON_OBJECT_SIZE(7) + 1024;
DynamicJsonDocument override_data(capacity);
EvseProperties props;
//check if there an override claim
Expand Down Expand Up @@ -477,39 +487,44 @@ mqtt_publish_json(JsonDocument &data, const char* topic) {
void
mqtt_loop() {
Profile_Start(mqtt_loop);

// Do we need to restart MQTT?
if(mqttRestartTime > 0 && millis() > mqttRestartTime)
{
mqttRestartTime = 0;
if (mqttclient.connected()) {
DBUGF("Disconnecting MQTT");
mqttclient.disconnect();
// Do we need to restart MQTT?
if(mqttRestartTime > 0 && millis() > mqttRestartTime)
{
mqttRestartTime = 0;
if (mqttclient.connected()) {
DBUGF("Disconnecting MQTT");
mqttclient.disconnect();
DynamicJsonDocument doc(JSON_OBJECT_SIZE(1) + 60);
doc["mqtt_connected"] = 0;
event_send(doc);
}
nextMqttReconnectAttempt = 0;
}
nextMqttReconnectAttempt = 0;
}

if (config_mqtt_enabled() && !mqttclient.connected()) {
long now = millis();
// try and reconnect every x seconds
if (now > nextMqttReconnectAttempt) {
nextMqttReconnectAttempt = now + MQTT_CONNECT_TIMEOUT;
mqtt_connect(); // Attempt to reconnect
if (config_mqtt_enabled() && !mqttclient.connected()) {
long now = millis();
// try and reconnect every x seconds
if (now > nextMqttReconnectAttempt) {
nextMqttReconnectAttempt = now + MQTT_CONNECT_TIMEOUT;
mqtt_connect(); // Attempt to reconnect
}
}
}

if (claimsVersion != evse.getClaimsVersion()) {
mqtt_publish_claim();
DBUGF("Claims has changed, publishing to MQTT");
claimsVersion = evse.getClaimsVersion();
}
// Temporise loop
if (millis() - loop_timer > MQTT_LOOP) {
loop_timer = millis();
if (claimsVersion != evse.getClaimsVersion()) {
mqtt_publish_claim();
DBUGF("Claims has changed, publishing to MQTT");
claimsVersion = evse.getClaimsVersion();
}

if (overrideVersion != manual.getVersion()) {
mqtt_publish_override;
DBUGF("Override has changed, publishing to MQTT");
overrideVersion = manual.getVersion();
if (overrideVersion != manual.getVersion()) {
mqtt_publish_override;
DBUGF("Override has changed, publishing to MQTT");
overrideVersion = manual.getVersion();
}
}

Profile_End(mqtt_loop, 5);
}

Expand Down
2 changes: 2 additions & 0 deletions src/mqtt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#define MQTT_PROTOCOL_WEBSOCKET 2
#define MQTT_PROTOCOL_WEBSOCKET_SSL 3

#define MQTT_LOOP 500

extern void mqtt_msg_callback();

// -------------------------------------------------------------------
Expand Down