Skip to content

Don't start MQTT with no networking #980

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

Merged
merged 1 commit into from
Jun 26, 2025
Merged

Don't start MQTT with no networking #980

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
15 changes: 8 additions & 7 deletions src/mqtt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

Mqtt mqtt(evse); // global instance

Mqtt::Mqtt(EvseManager &evseManager) :
Mqtt::Mqtt(EvseManager &evseManager) :
MicroTasks::Task(),
_evse(&evseManager)
{
Expand Down Expand Up @@ -84,7 +84,7 @@ unsigned long Mqtt::loop(MicroTasks::WakeReason reason) {
}

// Manage connection state
if (config_mqtt_enabled() && !_mqttclient.connected() && !_connecting) {
if (net.isConnected() && config_mqtt_enabled() && !_mqttclient.connected() && !_connecting) {
long now = millis();
if (now > _nextMqttReconnectAttempt) {
_nextMqttReconnectAttempt = now + MQTT_CONNECT_TIMEOUT;
Expand All @@ -99,9 +99,9 @@ unsigned long Mqtt::loop(MicroTasks::WakeReason reason) {
checkAndPublishUpdates();
}
}


Profile_End(Mqtt_loop, 5);
//return config_mqtt_enabled() ? MQTT_LOOP_INTERVAL : MicroTask.Infinate;
return MQTT_LOOP_INTERVAL;
}

Expand All @@ -110,7 +110,7 @@ void Mqtt::attemptConnection() {
return;
}
_connecting = true;
DBUGLN("Mqtt attempting connection...");
DBUGF("MQTT attempting connection... (%s)\n", net.isConnected() ? "connected" : "not connected");

String mqtt_host = mqtt_server + ":" + String(mqtt_port);
DBUGF("MQTT Connecting to... %s://%s", MQTT_MQTT == config_mqtt_protocol() ? "mqtt" : "mqtts", mqtt_host.c_str());
Expand Down Expand Up @@ -211,7 +211,7 @@ void Mqtt::subscribeTopics() {
_mqttclient.subscribe(mqtt_live_pwr); yield();
}
}

// Vehicle data
if (mqtt_vehicle_soc != "") { _mqttclient.subscribe(mqtt_vehicle_soc); yield(); }
if (mqtt_vehicle_range != "") { _mqttclient.subscribe(mqtt_vehicle_range); yield(); }
Expand Down Expand Up @@ -240,7 +240,7 @@ void Mqtt::publishInitialState() {
_overrideVersion = manual.getVersion() == 0 ? 1 : manual.getVersion() -1;
_scheduleVersion = scheduler.getVersion() == 0 ? 1 : scheduler.getVersion() -1;
_limitVersion = limit.getVersion() == 0 ? 1 : limit.getVersion() -1;

checkAndPublishUpdates(); // This will now publish everything
}

Expand Down Expand Up @@ -421,6 +421,7 @@ bool Mqtt::isConnected() {
void Mqtt::restartConnection() {
DBUGLN("MQTT restart requested");
_mqttRestartTime = millis() + 50; // Schedule restart in the near future in loop
MicroTask.wakeTask(this); // Ensure loop runs to handle the restart
}

void Mqtt::publishData(JsonDocument &data) {
Expand Down Expand Up @@ -573,4 +574,4 @@ void Mqtt::notifyConfigChanged() {
_configVersion = config_version();
if (isConnected()) publishConfig();
}
}
}
Loading