MQTT: refactor the producer as a finite state machine

Contributes to issue #1385
victronenergy · Aug 6, 2024 · 670f0b9 · 670f0b9
1 parent 66ed44b
commit 670f0b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/backendconnection.cpp b/src/backendconnection.cpp
@@ -62,6 +62,9 @@ void BackendConnection::setState(VeQItemMqttProducer::ConnectionState backendCon
 		setState(BackendConnection::State::Idle);
 		break;
 	}
+	case VeQItemMqttProducer::WaitingToConnect: // fall through
+	case VeQItemMqttProducer::TransportConnecting: // fall through
+	case VeQItemMqttProducer::TransportConnected: // fall through
 	case VeQItemMqttProducer::Connecting:
 	{
 		setState(BackendConnection::State::Connecting);
@@ -72,6 +75,7 @@ void BackendConnection::setState(VeQItemMqttProducer::ConnectionState backendCon
 		setState(BackendConnection::State::Connected);
 		break;
 	}
+	case VeQItemMqttProducer::Identified: // fall through
 	case VeQItemMqttProducer::Initializing:
 	{
 		setState(BackendConnection::State::Initializing);
@@ -87,6 +91,9 @@ void BackendConnection::setState(VeQItemMqttProducer::ConnectionState backendCon
 		setState(BackendConnection::State::Disconnected);
 		break;
 	}
+	case VeQItemMqttProducer::WaitingToReconnect: // fall through
+	case VeQItemMqttProducer::TransportReconnecting: // fall through
+	case VeQItemMqttProducer::TransportReconnected: // fall through
 	case VeQItemMqttProducer::Reconnecting:
 	{
 		setState(BackendConnection::State::Reconnecting);

diff --git a/src/veutil b/src/veutil
+33 −3		inc/veutil/qt/ve_qitems_mqtt.hpp
+552 −273		src/qt/ve_qitems_mqtt.cpp