From 006b1dc03497d84517b4bc4e7b41c4fb0095bdd4 Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Wed, 9 Nov 2022 18:14:57 +0100 Subject: [PATCH] Added: Auth --- FabLock_Software/src/config_example.h | 2 ++ FabLock_Software/src/main.cpp | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/FabLock_Software/src/config_example.h b/FabLock_Software/src/config_example.h index 1ab4f44..c7428aa 100644 --- a/FabLock_Software/src/config_example.h +++ b/FabLock_Software/src/config_example.h @@ -1,6 +1,8 @@ #define WLAN_SSID "" #define WLAN_PASS "" #define MQTT_BROKER "" +#define MQTT_USERNAME "" +#define MQTT_PASSWORD "" #define FABLOCKID 1 #define MPC_RELAIS_ADDR 0x20 #define HAS_FEEDBACK 1 diff --git a/FabLock_Software/src/main.cpp b/FabLock_Software/src/main.cpp index 4108abf..a9a0d00 100644 --- a/FabLock_Software/src/main.cpp +++ b/FabLock_Software/src/main.cpp @@ -86,8 +86,19 @@ void reconnect() Serial.println("Connecting MQTT ..."); String clientId = "FABLOCK-"; clientId += String(random(0xffff), HEX); - if (client.connect(clientId.c_str())) - { + + bool connected = false; + + if(MQTT_USERNAME == "") + { + connected = client.connect(clientId.c_str()); + } + else + { + connected = client.connect(clientId.c_str(), MQTT_USERNAME, MQTT_PASSWORD); + } + if (connected) + { snprintf (topic_recv, TOPIC_BUFFER_SIZE, "fablock/%03d/+/trigger", FABLOCKID); client.subscribe(topic_recv); snprintf (topic_recv, TOPIC_BUFFER_SIZE, "fablock/%03d/+/set_state", FABLOCKID);