andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2

Browse Source
This commit is contained in:
MichaelDvP
2024-02-15 09:08:01 +01:00
parent ce33fa6535 8ebc552cac
commit d797c3371b
110 changed files with 1942 additions and 1923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/framework/MqttSettingsService.h
View File

@@ -1,11 +1,11 @@
#ifndef MqttSettingsService_h
#define MqttSettingsService_h
#include <StatefulService.h>
#include <HttpEndpoint.h>
#include <FSPersistence.h>
#include "StatefulService.h"
#include "HttpEndpoint.h"
#include "FSPersistence.h"
#include <espMqttClient.h>
#include <ESPUtils.h>
#include <uuid/common.h>
@@ -38,13 +38,6 @@
#define FACTORY_MQTT_PASSWORD ""
#endif
#ifndef FACTORY_MQTT_CLIENT_ID
#define FACTORY_MQTT_CLIENT_ID generateClientId()
static String generateClientId() {
return ESPUtils::defaultDeviceValue("esp32-");
}
#endif
#ifndef FACTORY_MQTT_KEEP_ALIVE
#define FACTORY_MQTT_KEEP_ALIVE 16
#endif
@@ -59,21 +52,14 @@ static String generateClientId() {
class MqttSettings {
public:
// host and port - if enabled
bool enabled;
String host;
uint16_t port;
String rootCA;
bool enableTLS;
// username and password
String username;
String password;
// client id settings
String clientId;
// connection settings
String username;
String password;
String clientId;
uint16_t keepAlive;
bool cleanSession;
@@ -124,14 +110,6 @@ class MqttSettingsService : public StatefulService<MqttSettings> {
HttpEndpoint<MqttSettings> _httpEndpoint;
FSPersistence<MqttSettings> _fsPersistence;
// Pointers to hold retained copies of the mqtt client connection strings.
// This is required as espMqttClient holds references to the supplied connection strings.
char * _retainedHost;
char * _retainedClientId;
char * _retainedUsername;
char * _retainedPassword;
char * _retainedRootCA;
// variable to help manage connection
bool _reconfigureMqtt;
unsigned long _disconnectedAt;
@@ -142,11 +120,12 @@ class MqttSettingsService : public StatefulService<MqttSettings> {
// the MQTT client instance
MqttClient * _mqttClient;
void WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info);
void WiFiEvent(WiFiEvent_t event);
void onMqttConnect(bool sessionPresent);
void onMqttDisconnect(espMqttClientTypes::DisconnectReason reason);
void
onMqttMessage(const espMqttClientTypes::MessageProperties & properties, const char * topic, const uint8_t * payload, size_t len, size_t index, size_t total);
bool configureMqtt();
};