From ec0da25bfe56d352840136bcc9e05f8b4aee20dd Mon Sep 17 00:00:00 2001 From: theFeiter Date: Sat, 25 Jun 2022 20:50:21 +0200 Subject: [PATCH] Add MQTT port selection and MQTT user/password auth support --- Examples/3_ESPNOW_Gateway/fdrs_config.h | 7 +++++++ Examples/3_ESPNOW_Gateway/fdrs_functions.h | 15 ++++++++++++++- Examples/4_UART_Gateway/fdrs_config.h | 7 +++++++ Examples/4_UART_Gateway/fdrs_functions.h | 15 ++++++++++++++- Examples/5_MQTT_Gateway/fdrs_config.h | 7 +++++++ Examples/5_MQTT_Gateway/fdrs_functions.h | 15 ++++++++++++++- FDRS_Gateway2000/fdrs_config.h | 7 +++++++ FDRS_Gateway2000/fdrs_functions.h | 15 ++++++++++++++- 8 files changed, 84 insertions(+), 4 deletions(-) diff --git a/Examples/3_ESPNOW_Gateway/fdrs_config.h b/Examples/3_ESPNOW_Gateway/fdrs_config.h index 10ee955..d94ff39 100644 --- a/Examples/3_ESPNOW_Gateway/fdrs_config.h +++ b/Examples/3_ESPNOW_Gateway/fdrs_config.h @@ -34,6 +34,13 @@ #define WIFI_SSID "Your SSID" #define WIFI_PASS "Your Password" #define MQTT_ADDR "192.168.0.8" +#define MQTT_PORT 1883 // Default MQTT port is 1883 + +//MQTT Credentials -- Needed only if MQTT broker requires authentication +//#define MQTT_AUTH +//#define MQTT_USER "Your MQTT Username" +//#define MQTT_PASS "Your MQTT Password" + // MQTT Topics #define TOPIC_DATA "fdrs/data" #define TOPIC_STATUS "fdrs/status" diff --git a/Examples/3_ESPNOW_Gateway/fdrs_functions.h b/Examples/3_ESPNOW_Gateway/fdrs_functions.h index 993ea43..9418afd 100644 --- a/Examples/3_ESPNOW_Gateway/fdrs_functions.h +++ b/Examples/3_ESPNOW_Gateway/fdrs_functions.h @@ -14,12 +14,18 @@ #define FDRS_WIFI_SSID GLOBAL_SSID #define FDRS_WIFI_PASS GLOBAL_PASS #define FDRS_MQTT_ADDR GLOBAL_MQTT_ADDR +#define FDRS_MQTT_PORT GLOBAL_MQTT_PORT +#define FDRS_MQTT_USER GLOBAL_MQTT_USER +#define FDRS_MQTT_PASS GLOBAL_MQTT_PASS #define FDRS_BAND GLOBAL_BAND #define FDRS_SF GLOBAL_SF #else #define FDRS_WIFI_SSID WIFI_SSID #define FDRS_WIFI_PASS WIFI_PASS #define FDRS_MQTT_ADDR MQTT_ADDR +#define FDRS_MQTT_PORT MQTT_PORT +#define FDRS_MQTT_USER MQTT_USER +#define FDRS_MQTT_PASS MQTT_PASS #define FDRS_BAND BAND #define FDRS_SF SF #endif @@ -100,8 +106,15 @@ PubSubClient client(espClient); const char* ssid = FDRS_WIFI_SSID; const char* password = FDRS_WIFI_PASS; const char* mqtt_server = FDRS_MQTT_ADDR; +const int mqtt_port = FDRS_MQTT_PORT; +#endif +#ifdef MQTT_AUTH +const char* mqtt_user = FDRS_MQTT_USER; +const char* mqtt_pass = FDRS_MQTT_PASS; +#else +const char* mqtt_user = null; +const char* mqtt_pass = null; #endif - // Set ESP-NOW send and receive callbacks for either ESP8266 or ESP32 #if defined(ESP8266) diff --git a/Examples/4_UART_Gateway/fdrs_config.h b/Examples/4_UART_Gateway/fdrs_config.h index ec5c749..ff89335 100644 --- a/Examples/4_UART_Gateway/fdrs_config.h +++ b/Examples/4_UART_Gateway/fdrs_config.h @@ -34,6 +34,13 @@ #define WIFI_SSID "Your SSID" #define WIFI_PASS "Your Password" #define MQTT_ADDR "192.168.0.8" +#define MQTT_PORT 1883 // Default MQTT port is 1883 + +//MQTT Credentials -- Needed only if MQTT broker requires authentication +//#define MQTT_AUTH +//#define MQTT_USER "Your MQTT Username" +//#define MQTT_PASS "Your MQTT Password" + // MQTT Topics #define TOPIC_DATA "fdrs/data" #define TOPIC_STATUS "fdrs/status" diff --git a/Examples/4_UART_Gateway/fdrs_functions.h b/Examples/4_UART_Gateway/fdrs_functions.h index 993ea43..9418afd 100644 --- a/Examples/4_UART_Gateway/fdrs_functions.h +++ b/Examples/4_UART_Gateway/fdrs_functions.h @@ -14,12 +14,18 @@ #define FDRS_WIFI_SSID GLOBAL_SSID #define FDRS_WIFI_PASS GLOBAL_PASS #define FDRS_MQTT_ADDR GLOBAL_MQTT_ADDR +#define FDRS_MQTT_PORT GLOBAL_MQTT_PORT +#define FDRS_MQTT_USER GLOBAL_MQTT_USER +#define FDRS_MQTT_PASS GLOBAL_MQTT_PASS #define FDRS_BAND GLOBAL_BAND #define FDRS_SF GLOBAL_SF #else #define FDRS_WIFI_SSID WIFI_SSID #define FDRS_WIFI_PASS WIFI_PASS #define FDRS_MQTT_ADDR MQTT_ADDR +#define FDRS_MQTT_PORT MQTT_PORT +#define FDRS_MQTT_USER MQTT_USER +#define FDRS_MQTT_PASS MQTT_PASS #define FDRS_BAND BAND #define FDRS_SF SF #endif @@ -100,8 +106,15 @@ PubSubClient client(espClient); const char* ssid = FDRS_WIFI_SSID; const char* password = FDRS_WIFI_PASS; const char* mqtt_server = FDRS_MQTT_ADDR; +const int mqtt_port = FDRS_MQTT_PORT; +#endif +#ifdef MQTT_AUTH +const char* mqtt_user = FDRS_MQTT_USER; +const char* mqtt_pass = FDRS_MQTT_PASS; +#else +const char* mqtt_user = null; +const char* mqtt_pass = null; #endif - // Set ESP-NOW send and receive callbacks for either ESP8266 or ESP32 #if defined(ESP8266) diff --git a/Examples/5_MQTT_Gateway/fdrs_config.h b/Examples/5_MQTT_Gateway/fdrs_config.h index 973d1ce..a856e82 100644 --- a/Examples/5_MQTT_Gateway/fdrs_config.h +++ b/Examples/5_MQTT_Gateway/fdrs_config.h @@ -67,6 +67,13 @@ #define WIFI_SSID "Your SSID" #define WIFI_PASS "Your Password" #define MQTT_ADDR "192.168.0.8" +#define MQTT_PORT 1883 // Default MQTT port is 1883 + +//MQTT Credentials -- Needed only if MQTT broker requires authentication +//#define MQTT_AUTH +//#define MQTT_USER "Your MQTT Username" +//#define MQTT_PASS "Your MQTT Password" + // MQTT Topics #define TOPIC_DATA "fdrs/data" #define TOPIC_STATUS "fdrs/status" diff --git a/Examples/5_MQTT_Gateway/fdrs_functions.h b/Examples/5_MQTT_Gateway/fdrs_functions.h index 993ea43..9418afd 100644 --- a/Examples/5_MQTT_Gateway/fdrs_functions.h +++ b/Examples/5_MQTT_Gateway/fdrs_functions.h @@ -14,12 +14,18 @@ #define FDRS_WIFI_SSID GLOBAL_SSID #define FDRS_WIFI_PASS GLOBAL_PASS #define FDRS_MQTT_ADDR GLOBAL_MQTT_ADDR +#define FDRS_MQTT_PORT GLOBAL_MQTT_PORT +#define FDRS_MQTT_USER GLOBAL_MQTT_USER +#define FDRS_MQTT_PASS GLOBAL_MQTT_PASS #define FDRS_BAND GLOBAL_BAND #define FDRS_SF GLOBAL_SF #else #define FDRS_WIFI_SSID WIFI_SSID #define FDRS_WIFI_PASS WIFI_PASS #define FDRS_MQTT_ADDR MQTT_ADDR +#define FDRS_MQTT_PORT MQTT_PORT +#define FDRS_MQTT_USER MQTT_USER +#define FDRS_MQTT_PASS MQTT_PASS #define FDRS_BAND BAND #define FDRS_SF SF #endif @@ -100,8 +106,15 @@ PubSubClient client(espClient); const char* ssid = FDRS_WIFI_SSID; const char* password = FDRS_WIFI_PASS; const char* mqtt_server = FDRS_MQTT_ADDR; +const int mqtt_port = FDRS_MQTT_PORT; +#endif +#ifdef MQTT_AUTH +const char* mqtt_user = FDRS_MQTT_USER; +const char* mqtt_pass = FDRS_MQTT_PASS; +#else +const char* mqtt_user = null; +const char* mqtt_pass = null; #endif - // Set ESP-NOW send and receive callbacks for either ESP8266 or ESP32 #if defined(ESP8266) diff --git a/FDRS_Gateway2000/fdrs_config.h b/FDRS_Gateway2000/fdrs_config.h index d590ae0..d7e81b5 100644 --- a/FDRS_Gateway2000/fdrs_config.h +++ b/FDRS_Gateway2000/fdrs_config.h @@ -67,6 +67,13 @@ #define WIFI_SSID "Your SSID" #define WIFI_PASS "Your Password" #define MQTT_ADDR "192.168.0.8" +#define MQTT_PORT 1883 // Default MQTT port is 1883 + +//MQTT Credentials -- Needed only if MQTT broker requires authentication +//#define MQTT_AUTH +//#define MQTT_USER "Your MQTT Username" +//#define MQTT_PASS "Your MQTT Password" + // MQTT Topics #define TOPIC_DATA "fdrs/data" #define TOPIC_STATUS "fdrs/status" diff --git a/FDRS_Gateway2000/fdrs_functions.h b/FDRS_Gateway2000/fdrs_functions.h index 9ff6555..ffb0456 100644 --- a/FDRS_Gateway2000/fdrs_functions.h +++ b/FDRS_Gateway2000/fdrs_functions.h @@ -19,12 +19,18 @@ #define FDRS_WIFI_SSID GLOBAL_SSID #define FDRS_WIFI_PASS GLOBAL_PASS #define FDRS_MQTT_ADDR GLOBAL_MQTT_ADDR +#define FDRS_MQTT_PORT GLOBAL_MQTT_PORT +#define FDRS_MQTT_USER GLOBAL_MQTT_USER +#define FDRS_MQTT_PASS GLOBAL_MQTT_PASS #define FDRS_BAND GLOBAL_BAND #define FDRS_SF GLOBAL_SF #else #define FDRS_WIFI_SSID WIFI_SSID #define FDRS_WIFI_PASS WIFI_PASS #define FDRS_MQTT_ADDR MQTT_ADDR +#define FDRS_MQTT_PORT MQTT_PORT +#define FDRS_MQTT_USER MQTT_USER +#define FDRS_MQTT_PASS MQTT_PASS #define FDRS_BAND BAND #define FDRS_SF SF #endif @@ -105,8 +111,15 @@ PubSubClient client(espClient); const char* ssid = FDRS_WIFI_SSID; const char* password = FDRS_WIFI_PASS; const char* mqtt_server = FDRS_MQTT_ADDR; +const int mqtt_port = FDRS_MQTT_PORT; +#endif +#ifdef MQTT_AUTH +const char* mqtt_user = FDRS_MQTT_USER; +const char* mqtt_pass = FDRS_MQTT_PASS; +#else +const char* mqtt_user = null; +const char* mqtt_pass = null; #endif - // Set ESP-NOW send and receive callbacks for either ESP8266 or ESP32 #if defined(ESP8266)