diff -r 9a4c9b7f078c -r 36ec7431ad04 MqttMonitor/MqttClient.py
--- a/MqttMonitor/MqttClient.py Fri Jul 23 17:48:22 2021 +0200
+++ b/MqttMonitor/MqttClient.py Fri Jul 23 19:48:14 2021 +0200
@@ -7,8 +7,6 @@
Module implementing a PyQt wrapper around the paho MQTT client.
"""
-import enum
-
from PyQt6.QtCore import (
pyqtSignal, pyqtSlot, QObject, QCoreApplication, QTimer
)
@@ -19,14 +17,7 @@
from Utilities.crypto import pwConvert
-
-class MqttProtocols(enum.IntEnum):
- """
- Class defining the supported MQTT protocol versions.
- """
- MQTTv31 = mqtt.MQTTv31
- MQTTv311 = mqtt.MQTTv311
- MQTTv5 = mqtt.MQTTv5
+from .MqttProtocols import MqttProtocols
class MqttClient(QObject):
@@ -489,7 +480,7 @@
properties=properties,
clearWill=clearWill)
else:
- keepalive = self.defaultConnectionOptions["Keepalive"]
+ keepalive = self.defaultConnectionOptions()["Keepalive"]
self.connectToServer(host, port=port, keepalive=keepalive,
bindAddress=bindAddress,
clearWill=clearWill)
@@ -507,9 +498,11 @@
"TlsCaCert", "TlsClientCert", "TlsClientKey", "UserProperties".
@rtype dict
"""
+ from PluginMqttMonitor import mqttPluginObject
+
return {
"ClientId": "ERIC7_MQTT_MONITOR_CLIENT",
- "Protocol": MqttProtocols.MQTTv311,
+ "Protocol": mqttPluginObject.getPreferences("DefaultProtocol"),
"ConnectionTimeout": MqttClient.DefaultConnectTimeout,
"Keepalive": 60,
"CleanSession": True,
