Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 14 additions & 1 deletion LYWSD03MMC.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import logging
import json
import requests
import ssl

@dataclass
class Measurement:
Expand Down Expand Up @@ -365,6 +366,14 @@ def MQTTOnDisconnect(client, userdata,rc):
mqttConfig.read(args.mqttconfigfile)
broker = mqttConfig["MQTT"]["broker"]
port = int(mqttConfig["MQTT"]["port"])

# MQTTS parameters
tls = int(mqttConfig["MQTT"]["tls"])
cacerts = mqttConfig["MQTT"]["cacerts"] if mqttConfig["MQTT"]["cacerts"] else None
certificate = mqttConfig["MQTT"]["certificate"] if mqttConfig["MQTT"]["certificate"] else None
certificate_key = mqttConfig["MQTT"]["certificate_key"] if mqttConfig["MQTT"]["certificate_key"] else None
insecure = int(mqttConfig["MQTT"]["insecure"])

username = mqttConfig["MQTT"]["username"]
password = mqttConfig["MQTT"]["password"]
MQTTTopic = mqttConfig["MQTT"]["topic"]
Expand Down Expand Up @@ -393,11 +402,15 @@ def MQTTOnDisconnect(client, userdata,rc):
if len(lwt) > 0:
print("Using lastwill with topic:",lwt,"and message:",lastwill)
client.will_set(lwt,lastwill,qos=1)

# MQTTS parameters
if tls:
client.tls_set(cacerts, certificate, certificate_key, cert_reqs=ssl.CERT_REQUIRED, tls_version=ssl.PROTOCOL_TLS, ciphers=None)
client.tls_insecure_set(insecure)

client.connect_async(broker,port)
MQTTClient=client


if args.device:
if re.match("[0-9a-fA-F]{2}([:]?)[0-9a-fA-F]{2}(\\1[0-9a-fA-F]{2}){4}$",args.device):
adress=args.device
Expand Down
10 changes: 10 additions & 0 deletions mqtt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@ topic=ATCThermometer
receivername=
;subtopics=temperature,humidity

;Enable TLS / MQTTS
tls=0
;CA file
cacerts=isrgrootx1.pem
;Certificate file
certificate=
;Certificate key file
certificate_key=
;Enable TLS insecure mode
insecure=0

[DEFAULT]
;Do not change here, leave it as it is
Expand Down