From 624b08b63628bc59c6ac47b0ba7db87d3fdc6eb3 Mon Sep 17 00:00:00 2001 From: Florian Pfeiffer Date: Tue, 29 Aug 2017 01:37:11 +0200 Subject: [PATCH] Add #defines for MQTT Username+Password --- code/espurna/config/general.h | 2 ++ code/espurna/mqtt.ino | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/espurna/config/general.h b/code/espurna/config/general.h index 3d299b86..6afae625 100644 --- a/code/espurna/config/general.h +++ b/code/espurna/config/general.h @@ -331,6 +331,8 @@ PROGMEM const char* const custom_reset_string[] = { #define MQTT_SSL_FINGERPRINT "" #define MQTT_SERVER "" // Default MQTT broker address +#define MQTT_USER "" // Default MQTT broker usename +#define MQTT_PASS "" // Default MQTT broker password #define MQTT_PORT 1883 // MQTT broker port #define MQTT_TOPIC "/test/switch/{identifier}" // Default MQTT base topic #define MQTT_RETAIN true // MQTT retain flag diff --git a/code/espurna/mqtt.ino b/code/espurna/mqtt.ino index 6db86140..f41a4cc0 100644 --- a/code/espurna/mqtt.ino +++ b/code/espurna/mqtt.ino @@ -322,8 +322,8 @@ void mqttConnect() { char * host = strdup(getSetting("mqttServer", MQTT_SERVER).c_str()); unsigned int port = getSetting("mqttPort", MQTT_PORT).toInt(); - _mqttUser = strdup(getSetting("mqttUser").c_str()); - _mqttPass = strdup(getSetting("mqttPassword").c_str()); + _mqttUser = strdup(getSetting("mqttUser", MQTT_USER).c_str()); + _mqttPass = strdup(getSetting("mqttPassword", MQTT_PASSWORD).c_str()); if (_mqttWill) free(_mqttWill); _mqttWill = strdup((_mqttTopic + MQTT_TOPIC_STATUS).c_str());