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

merge multiple_instances with entity_format

Browse Source
This commit is contained in:
Proddy
2022-12-15 21:51:11 +01:00
parent ccbb56d403
commit ba90ebda4c
15 changed files with 52 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/framework/MqttSettingsService.cpp
View File

@@ -155,7 +155,6 @@ void MqttSettings::read(MqttSettings & settings, JsonObject & root) {
root["keep_alive"] = settings.keepAlive;
root["clean_session"] = settings.cleanSession;
root["multiple_instances"] = settings.multiple_instances;
root["entity_fullname"] = settings.entity_fullname;
// added by proddy for EMS-ESP
root["publish_time_boiler"] = settings.publish_time_boiler;
@@ -189,7 +188,6 @@ StateUpdateResult MqttSettings::update(JsonObject & root, MqttSettings & setting
newSettings.keepAlive = root["keep_alive"] | FACTORY_MQTT_KEEP_ALIVE;
newSettings.cleanSession = root["clean_session"] | FACTORY_MQTT_CLEAN_SESSION;
newSettings.multiple_instances = root["multiple_instances"] | FACTORY_MQTT_MULTIPLE_INSTANCES;
newSettings.entity_fullname = root["entity_fullname"] | FACTORY_MQTT_ENTITY_FULLNAME;
newSettings.mqtt_qos = root["mqtt_qos"] | EMSESP_DEFAULT_MQTT_QOS;
newSettings.mqtt_retain = root["mqtt_retain"] | EMSESP_DEFAULT_MQTT_RETAIN;

7
lib/framework/MqttSettingsService.h
View File

@@ -61,10 +61,6 @@ static String generateClientId() {
#define FACTORY_MQTT_MULTIPLE_INSTANCES false
#endif
#ifndef FACTORY_MQTT_ENTITY_FULLNAME
#define FACTORY_MQTT_ENTITY_FULLNAME false
#endif
class MqttSettings {
public:
// host and port - if enabled
@@ -86,9 +82,6 @@ class MqttSettings {
// multiple instances
bool multiple_instances;
// use v3.4 entity fullnames in Discovery
bool entity_fullname;
// proddy EMS-ESP specific
String base;
uint16_t publish_time_boiler;