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

remove static functions from System class

Browse Source
This commit is contained in:
proddy
2021-03-01 22:21:18 +01:00
parent a092d83fad
commit ea5b6e5c58
17 changed files with 62 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/framework/MqttSettingsService.h
View File

@@ -6,6 +6,7 @@
#include <FSPersistence.h>
#include <AsyncMqttClient.h>
#include <ESPUtils.h>
#include <uuid/common.h>
#define MQTT_RECONNECTION_DELAY 1000
@@ -60,8 +61,7 @@ static String generateClientId() {
#define FACTORY_MQTT_MAX_TOPIC_LENGTH 128
#endif
#define EMSESP_DEFAULT_BOOL_FORMAT 1 // on/off
#define EMSESP_DEFAULT_BOOL_FORMAT 1 // on/off
#define EMSESP_DEFAULT_DALLAS_FORMAT 1 // sensorid
#define EMSESP_DEFAULT_HA_CLIMATE_FORMAT 1 // current temp
#define EMSESP_DEFAULT_MQTT_QOS 0
@@ -69,10 +69,6 @@ static String generateClientId() {
#define EMSESP_DEFAULT_HA_ENABLED false
#define EMSESP_DEFAULT_PUBLISH_TIME 10
#include "../../src/system.h"
#include "../../src/mqtt.h"
#include "../../src/dallassensor.h"
class MqttSettings {
public:
// host and port - if enabled