From a65c3ac96f99186008d67fd81affe33a35758475 Mon Sep 17 00:00:00 2001 From: proddy Date: Thu, 16 Jul 2020 22:34:13 +0200 Subject: [PATCH] moved mqtt and system to correct web pages --- interface/src/mqtt/MqttSettingsForm.tsx | 48 +++- interface/src/mqtt/MqttStatus.ts | 12 + interface/src/mqtt/MqttStatusForm.tsx | 16 +- interface/src/mqtt/types.ts | 5 + interface/src/project/EMSESPSettings.tsx | 35 +++ .../src/project/EMSESPSettingsController.tsx | 51 +--- interface/src/project/EMSESPStatus.ts | 12 - interface/src/project/EMSESPStatusForm.tsx | 69 ++--- interface/src/project/EMSESPtypes.ts | 7 - interface/src/system/SystemStatusForm.tsx | 21 ++ interface/src/system/types.ts | 2 + lib/framework/MqttSettingsService.cpp | 242 +++++++++++------- lib/framework/MqttSettingsService.h | 156 ++++++----- lib/framework/MqttStatus.cpp | 33 ++- lib/framework/MqttStatus.h | 14 +- lib/framework/SystemStatus.cpp | 62 ++--- lib/framework/SystemStatus.h | 13 +- src/EMSESPSettingsService.cpp | 56 ++-- src/EMSESPSettingsService.h | 27 +- src/EMSESPStatusService.cpp | 3 - src/devices/thermostat.cpp | 7 +- src/mqtt.cpp | 8 +- src/sensors.cpp | 2 +- src/system.cpp | 11 +- 24 files changed, 484 insertions(+), 428 deletions(-) create mode 100644 interface/src/project/EMSESPSettings.tsx diff --git a/interface/src/mqtt/MqttSettingsForm.tsx b/interface/src/mqtt/MqttSettingsForm.tsx index 1f5bf21c4..aa440442e 100644 --- a/interface/src/mqtt/MqttSettingsForm.tsx +++ b/interface/src/mqtt/MqttSettingsForm.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import { TextValidator, ValidatorForm } from 'react-material-ui-form-validator'; +import { TextValidator, ValidatorForm, SelectValidator } from 'react-material-ui-form-validator'; import { Checkbox, TextField } from '@material-ui/core'; import SaveIcon from '@material-ui/icons/Save'; +import MenuItem from '@material-ui/core/MenuItem'; import { RestFormProps, FormActions, FormButton, BlockFormControlLabel, PasswordValidator } from '../components'; import { isIP, isHostname, or } from '../validators'; @@ -115,6 +116,51 @@ class MqttSettingsForm extends React.Component { onChange={handleValueChange('max_topic_length')} margin="normal" /> + + } + label="MQTT Heartbeat" + /> + + Single + Nested + Home Assistant + Custom + + + 0 + 1 + 2 + + } variant="contained" color="primary" type="submit"> Save diff --git a/interface/src/mqtt/MqttStatus.ts b/interface/src/mqtt/MqttStatus.ts index b9bb80cbd..a029b17ee 100644 --- a/interface/src/mqtt/MqttStatus.ts +++ b/interface/src/mqtt/MqttStatus.ts @@ -43,3 +43,15 @@ export const disconnectReason = ({ disconnect_reason }: MqttStatus) => { return "Unknown" } } + +export const mqttStatusHighlight2 = ({ mqtt_fails }: MqttStatus, theme: Theme) => { + + if (mqtt_fails === 0) + return theme.palette.success.main; + + if (mqtt_fails < 10) + return theme.palette.warning.main; + + return theme.palette.success.main; + +} \ No newline at end of file diff --git a/interface/src/mqtt/MqttStatusForm.tsx b/interface/src/mqtt/MqttStatusForm.tsx index 5a80a4166..57935f1b0 100644 --- a/interface/src/mqtt/MqttStatusForm.tsx +++ b/interface/src/mqtt/MqttStatusForm.tsx @@ -6,9 +6,10 @@ import { Avatar, Divider, List, ListItem, ListItemAvatar, ListItemText } from '@ import DeviceHubIcon from '@material-ui/icons/DeviceHub'; import RefreshIcon from '@material-ui/icons/Refresh'; import ReportIcon from '@material-ui/icons/Report'; +import SpeakerNotesOffIcon from "@material-ui/icons/SpeakerNotesOff"; import { RestFormProps, FormActions, FormButton, HighlightAvatar } from '../components'; -import { mqttStatusHighlight, mqttStatus, disconnectReason } from './MqttStatus'; +import { mqttStatusHighlight, mqttStatus, mqttStatusHighlight2, disconnectReason } from './MqttStatus'; import { MqttStatus } from './types'; type MqttStatusFormProps = RestFormProps & WithTheme; @@ -16,7 +17,7 @@ type MqttStatusFormProps = RestFormProps & WithTheme; class MqttStatusForm extends Component { renderConnectionStatus() { - const { data } = this.props + const { data, theme } = this.props if (data.connected) { return ( @@ -27,6 +28,17 @@ class MqttStatusForm extends Component { + + + + + + + + ); } diff --git a/interface/src/mqtt/types.ts b/interface/src/mqtt/types.ts index 04e20caca..7f9bf44c8 100644 --- a/interface/src/mqtt/types.ts +++ b/interface/src/mqtt/types.ts @@ -14,6 +14,7 @@ export interface MqttStatus { connected: boolean; client_id: string; disconnect_reason: MqttDisconnectReason; + mqtt_fails: number; } export interface MqttSettings { @@ -26,4 +27,8 @@ export interface MqttSettings { keep_alive: number; clean_session: boolean; max_topic_length: number; + publish_time: number; + mqtt_format: number; + mqtt_qos: number; + system_heartbeat: boolean; } diff --git a/interface/src/project/EMSESPSettings.tsx b/interface/src/project/EMSESPSettings.tsx new file mode 100644 index 000000000..f61fa9b71 --- /dev/null +++ b/interface/src/project/EMSESPSettings.tsx @@ -0,0 +1,35 @@ +import React, { Component } from 'react'; +import { Redirect, Switch, RouteComponentProps } from 'react-router-dom' + +import { Tabs, Tab } from '@material-ui/core'; + +import { PROJECT_PATH } from '../api'; +import { MenuAppBar } from '../components'; +import { AuthenticatedRoute } from '../authentication'; + +import EMSESPSettingsController from './EMSESPSettingsController'; + +class EMSESP extends Component { + + handleTabChange = (event: React.ChangeEvent<{}>, path: string) => { + this.props.history.push(path); + }; + + render() { + return ( + + + + + + + + + + + ) + } + +} + +export default EMSESP; diff --git a/interface/src/project/EMSESPSettingsController.tsx b/interface/src/project/EMSESPSettingsController.tsx index 961c4a5f3..973f81245 100644 --- a/interface/src/project/EMSESPSettingsController.tsx +++ b/interface/src/project/EMSESPSettingsController.tsx @@ -1,7 +1,7 @@ import React, { Component, Fragment } from 'react'; import { ValidatorForm, TextValidator, SelectValidator } from 'react-material-ui-form-validator'; -import { Checkbox, Typography, Box } from '@material-ui/core'; +import { Checkbox, Typography, Box, Link } from '@material-ui/core'; import SaveIcon from '@material-ui/icons/Save'; import MenuItem from '@material-ui/core/MenuItem'; @@ -46,9 +46,9 @@ function EMSESPSettingsControllerForm(props: EMSESPSettingsControllerFormProps) const { data, saveData, loadData, handleValueChange } = props; return ( - + - Customize EMS-ESP by editing the default settings here. Refer to the Wiki for assistance. + Customize EMS-ESP by editing the default settings here. Refer to the {'Wiki'} for descriptions of each setting. - - } - label="MQTT Heartbeat" - /> - - Single - Nested - Home Assistant - Custom - - - 0 - 1 - 2 - - { return "Unknown"; } } - -export const mqttStatusHighlight = ({ mqtt_fails }: EMSESPStatus, theme: Theme) => { - - if (mqtt_fails === 0) - return theme.palette.success.main; - - if (mqtt_fails < 10) - return theme.palette.warning.main; - - return theme.palette.success.main; - -} \ No newline at end of file diff --git a/interface/src/project/EMSESPStatusForm.tsx b/interface/src/project/EMSESPStatusForm.tsx index 0ed425e12..45800b290 100644 --- a/interface/src/project/EMSESPStatusForm.tsx +++ b/interface/src/project/EMSESPStatusForm.tsx @@ -7,20 +7,18 @@ import { TableCell, TableHead, TableRow, - Avatar, Divider, List, ListItem, ListItemAvatar, - ListItemText + ListItemText, + Typography, + Box, + Link } from "@material-ui/core"; -import BuildIcon from "@material-ui/icons/Build"; import RefreshIcon from "@material-ui/icons/Refresh"; import DeviceHubIcon from "@material-ui/icons/DeviceHub"; -import SpeakerNotesOffIcon from "@material-ui/icons/SpeakerNotesOff"; -import TimerIcon from "@material-ui/icons/Timer"; -import BatteryUnknownIcon from "@material-ui/icons/BatteryUnknown"; import { RestFormProps, @@ -28,11 +26,11 @@ import { FormButton, HighlightAvatar, } from "../components"; + import { busStatus, busStatusHighlight, - isConnected, - mqttStatusHighlight, + isConnected } from "./EMSESPStatus"; import { EMSESPStatus } from "./EMSESPtypes"; @@ -44,55 +42,24 @@ class EMSESPStatusForm extends Component { const { data, theme } = this.props; return ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Firmware Version is {data.version} +

+ Check for news and updates on the {'Wiki'} +
+ For live community chat go to {'Gitter'} +
+ To report issues, contribute and give kudos visit {'github.com/proddy/EMS-ESP'} + + - + {isConnected(data) && ( diff --git a/interface/src/project/EMSESPtypes.ts b/interface/src/project/EMSESPtypes.ts index 1b812c17d..26f64bdf3 100644 --- a/interface/src/project/EMSESPtypes.ts +++ b/interface/src/project/EMSESPtypes.ts @@ -1,16 +1,12 @@ export interface EMSESPSettings { tx_mode: number; ems_bus_id: number; - system_heartbeat: boolean; syslog_level: number; syslog_mark_interval: number; syslog_host: string; master_thermostat: number; shower_timer: boolean; shower_alert: boolean; - publish_time: number; - mqtt_format: number; - mqtt_qos: number; } export enum busConnectionStatus { @@ -26,9 +22,6 @@ export interface EMSESPStatus { tx_sent: number; crc_errors: number; tx_errors: number; - mqtt_fails: number; - uptime: string; - free_mem: number; } export interface Device { diff --git a/interface/src/system/SystemStatusForm.tsx b/interface/src/system/SystemStatusForm.tsx index 751946ecf..d85702bb2 100644 --- a/interface/src/system/SystemStatusForm.tsx +++ b/interface/src/system/SystemStatusForm.tsx @@ -13,6 +13,8 @@ import AppsIcon from '@material-ui/icons/Apps'; import PowerSettingsNewIcon from '@material-ui/icons/PowerSettingsNew'; import RefreshIcon from '@material-ui/icons/Refresh'; import SettingsBackupRestoreIcon from '@material-ui/icons/SettingsBackupRestore'; +import BatteryUnknownIcon from "@material-ui/icons/BatteryUnknown"; +import TimerIcon from "@material-ui/icons/Timer"; import { redirectingAuthorizedFetch, AuthenticatedContextProps, withAuthenticatedContext } from '../authentication'; import { RestFormProps, FormButton, ErrorButton } from '../components'; @@ -53,6 +55,14 @@ class SystemStatusForm extends Component + + + + + + + + @@ -84,6 +94,17 @@ class SystemStatusForm extends Component ) } + + + + + + + + diff --git a/interface/src/system/types.ts b/interface/src/system/types.ts index 67b15e225..bad8765d3 100644 --- a/interface/src/system/types.ts +++ b/interface/src/system/types.ts @@ -15,6 +15,8 @@ interface ESPSystemStatus { flash_chip_speed: number; fs_used: number; fs_total: number; + uptime: string; + free_mem: number; } export interface ESP32SystemStatus extends ESPSystemStatus { diff --git a/lib/framework/MqttSettingsService.cpp b/lib/framework/MqttSettingsService.cpp index b654fd278..ad6deb8eb 100644 --- a/lib/framework/MqttSettingsService.cpp +++ b/lib/framework/MqttSettingsService.cpp @@ -1,93 +1,98 @@ #include +// forward declarators +namespace emsesp { +class EMSESP { + public: + static System system_; + static Mqtt mqtt_; +}; +} // namespace emsesp + /** * Retains a copy of the cstr provided in the pointer provided using dynamic allocation. * * Frees the pointer before allocation and leaves it as nullptr if cstr == nullptr. */ -static char* retainCstr(const char* cstr, char** ptr) { - // free up previously retained value if exists - free(*ptr); - *ptr = nullptr; +static char * retainCstr(const char * cstr, char ** ptr) { + // free up previously retained value if exists + free(*ptr); + *ptr = nullptr; - // dynamically allocate and copy cstr (if non null) - if (cstr != nullptr) { - *ptr = (char*)malloc(strlen(cstr) + 1); - strcpy(*ptr, cstr); - } + // dynamically allocate and copy cstr (if non null) + if (cstr != nullptr) { + *ptr = (char *)malloc(strlen(cstr) + 1); + strcpy(*ptr, cstr); + } - // return reference to pointer for convenience - return *ptr; + // return reference to pointer for convenience + return *ptr; } -MqttSettingsService::MqttSettingsService(AsyncWebServer* server, FS* fs, SecurityManager* securityManager) : - _httpEndpoint(MqttSettings::read, MqttSettings::update, this, server, MQTT_SETTINGS_SERVICE_PATH, securityManager), - _fsPersistence(MqttSettings::read, MqttSettings::update, this, fs, MQTT_SETTINGS_FILE), - _retainedHost(nullptr), - _retainedClientId(nullptr), - _retainedUsername(nullptr), - _retainedPassword(nullptr), - _reconfigureMqtt(false), - _disconnectedAt(0), - _disconnectReason(AsyncMqttClientDisconnectReason::TCP_DISCONNECTED), - _mqttClient() { +MqttSettingsService::MqttSettingsService(AsyncWebServer * server, FS * fs, SecurityManager * securityManager) + : _httpEndpoint(MqttSettings::read, MqttSettings::update, this, server, MQTT_SETTINGS_SERVICE_PATH, securityManager) + , _fsPersistence(MqttSettings::read, MqttSettings::update, this, fs, MQTT_SETTINGS_FILE) + , _retainedHost(nullptr) + , _retainedClientId(nullptr) + , _retainedUsername(nullptr) + , _retainedPassword(nullptr) + , _reconfigureMqtt(false) + , _disconnectedAt(0) + , _disconnectReason(AsyncMqttClientDisconnectReason::TCP_DISCONNECTED) + , _mqttClient() { #ifdef ESP32 - WiFi.onEvent( - std::bind(&MqttSettingsService::onStationModeDisconnected, this, std::placeholders::_1, std::placeholders::_2), - WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED); - WiFi.onEvent(std::bind(&MqttSettingsService::onStationModeGotIP, this, std::placeholders::_1, std::placeholders::_2), - WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP); + WiFi.onEvent(std::bind(&MqttSettingsService::onStationModeDisconnected, this, std::placeholders::_1, std::placeholders::_2), + WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED); + WiFi.onEvent(std::bind(&MqttSettingsService::onStationModeGotIP, this, std::placeholders::_1, std::placeholders::_2), WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP); #elif defined(ESP8266) - _onStationModeDisconnectedHandler = WiFi.onStationModeDisconnected( - std::bind(&MqttSettingsService::onStationModeDisconnected, this, std::placeholders::_1)); - _onStationModeGotIPHandler = - WiFi.onStationModeGotIP(std::bind(&MqttSettingsService::onStationModeGotIP, this, std::placeholders::_1)); + _onStationModeDisconnectedHandler = WiFi.onStationModeDisconnected(std::bind(&MqttSettingsService::onStationModeDisconnected, this, std::placeholders::_1)); + _onStationModeGotIPHandler = WiFi.onStationModeGotIP(std::bind(&MqttSettingsService::onStationModeGotIP, this, std::placeholders::_1)); #endif - _mqttClient.onConnect(std::bind(&MqttSettingsService::onMqttConnect, this, std::placeholders::_1)); - _mqttClient.onDisconnect(std::bind(&MqttSettingsService::onMqttDisconnect, this, std::placeholders::_1)); - addUpdateHandler([&](const String& originId) { onConfigUpdated(); }, false); + _mqttClient.onConnect(std::bind(&MqttSettingsService::onMqttConnect, this, std::placeholders::_1)); + _mqttClient.onDisconnect(std::bind(&MqttSettingsService::onMqttDisconnect, this, std::placeholders::_1)); + addUpdateHandler([&](const String & originId) { onConfigUpdated(); }, false); } MqttSettingsService::~MqttSettingsService() { } void MqttSettingsService::begin() { - _fsPersistence.readFromFS(); + _fsPersistence.readFromFS(); } void MqttSettingsService::loop() { - if (_reconfigureMqtt || (_disconnectedAt && (unsigned long)(millis() - _disconnectedAt) >= MQTT_RECONNECTION_DELAY)) { - // reconfigure MQTT client - configureMqtt(); + if (_reconfigureMqtt || (_disconnectedAt && (unsigned long)(millis() - _disconnectedAt) >= MQTT_RECONNECTION_DELAY)) { + // reconfigure MQTT client + configureMqtt(); - // clear the reconnection flags - _reconfigureMqtt = false; - _disconnectedAt = 0; - } + // clear the reconnection flags + _reconfigureMqtt = false; + _disconnectedAt = 0; + } } bool MqttSettingsService::isEnabled() { - return _state.enabled; + return _state.enabled; } bool MqttSettingsService::isConnected() { - return _mqttClient.connected(); + return _mqttClient.connected(); } -const char* MqttSettingsService::getClientId() { - return _mqttClient.getClientId(); +const char * MqttSettingsService::getClientId() { + return _mqttClient.getClientId(); } AsyncMqttClientDisconnectReason MqttSettingsService::getDisconnectReason() { - return _disconnectReason; + return _disconnectReason; } -AsyncMqttClient* MqttSettingsService::getMqttClient() { - return &_mqttClient; +AsyncMqttClient * MqttSettingsService::getMqttClient() { + return &_mqttClient; } void MqttSettingsService::onMqttConnect(bool sessionPresent) { - /* + /* Serial.print(F("Connected to MQTT, ")); if (sessionPresent) { Serial.println(F("with persistent session")); @@ -98,66 +103,119 @@ void MqttSettingsService::onMqttConnect(bool sessionPresent) { } void MqttSettingsService::onMqttDisconnect(AsyncMqttClientDisconnectReason reason) { - // Serial.print(F("Disconnected from MQTT reason: ")); - // Serial.println((uint8_t)reason); - _disconnectReason = reason; - _disconnectedAt = millis(); + // Serial.print(F("Disconnected from MQTT reason: ")); + // Serial.println((uint8_t)reason); + _disconnectReason = reason; + _disconnectedAt = millis(); } void MqttSettingsService::onConfigUpdated() { - _reconfigureMqtt = true; - _disconnectedAt = 0; + _reconfigureMqtt = true; + _disconnectedAt = 0; } #ifdef ESP32 void MqttSettingsService::onStationModeGotIP(WiFiEvent_t event, WiFiEventInfo_t info) { - if (_state.enabled) { - // Serial.println(F("WiFi connection dropped, starting MQTT client.")); - onConfigUpdated(); - } + if (_state.enabled) { + // Serial.println(F("WiFi connection dropped, starting MQTT client.")); + onConfigUpdated(); + } } void MqttSettingsService::onStationModeDisconnected(WiFiEvent_t event, WiFiEventInfo_t info) { - if (_state.enabled) { - // Serial.println(F("WiFi connection dropped, stopping MQTT client.")); - onConfigUpdated(); - } + if (_state.enabled) { + // Serial.println(F("WiFi connection dropped, stopping MQTT client.")); + onConfigUpdated(); + } } #elif defined(ESP8266) -void MqttSettingsService::onStationModeGotIP(const WiFiEventStationModeGotIP& event) { - if (_state.enabled) { - // Serial.println(F("WiFi connection dropped, starting MQTT client.")); - onConfigUpdated(); - } +void MqttSettingsService::onStationModeGotIP(const WiFiEventStationModeGotIP & event) { + if (_state.enabled) { + // Serial.println(F("WiFi connection dropped, starting MQTT client.")); + onConfigUpdated(); + } } -void MqttSettingsService::onStationModeDisconnected(const WiFiEventStationModeDisconnected& event) { - if (_state.enabled) { - // Serial.println(F("WiFi connection dropped, stopping MQTT client.")); - onConfigUpdated(); - } +void MqttSettingsService::onStationModeDisconnected(const WiFiEventStationModeDisconnected & event) { + if (_state.enabled) { + // Serial.println(F("WiFi connection dropped, stopping MQTT client.")); + onConfigUpdated(); + } } #endif void MqttSettingsService::configureMqtt() { - // disconnect if currently connected - _mqttClient.disconnect(); + // disconnect if currently connected + _mqttClient.disconnect(); - // only connect if WiFi is connected and MQTT is enabled - if (_state.enabled && WiFi.isConnected()) { - // Serial.println(F("Connecting to MQTT...")); - _mqttClient.setServer(retainCstr(_state.host.c_str(), &_retainedHost), _state.port); - if (_state.username.length() > 0) { - _mqttClient.setCredentials( - retainCstr(_state.username.c_str(), &_retainedUsername), - retainCstr(_state.password.length() > 0 ? _state.password.c_str() : nullptr, &_retainedPassword)); - } else { - _mqttClient.setCredentials(retainCstr(nullptr, &_retainedUsername), retainCstr(nullptr, &_retainedPassword)); + // only connect if WiFi is connected and MQTT is enabled + if (_state.enabled && WiFi.isConnected()) { + // Serial.println(F("Connecting to MQTT...")); + _mqttClient.setServer(retainCstr(_state.host.c_str(), &_retainedHost), _state.port); + if (_state.username.length() > 0) { + _mqttClient.setCredentials(retainCstr(_state.username.c_str(), &_retainedUsername), + retainCstr(_state.password.length() > 0 ? _state.password.c_str() : nullptr, &_retainedPassword)); + } else { + _mqttClient.setCredentials(retainCstr(nullptr, &_retainedUsername), retainCstr(nullptr, &_retainedPassword)); + } + _mqttClient.setClientId(retainCstr(_state.clientId.c_str(), &_retainedClientId)); + _mqttClient.setKeepAlive(_state.keepAlive); + _mqttClient.setCleanSession(_state.cleanSession); + _mqttClient.setMaxTopicLength(_state.maxTopicLength); + _mqttClient.connect(); } - _mqttClient.setClientId(retainCstr(_state.clientId.c_str(), &_retainedClientId)); - _mqttClient.setKeepAlive(_state.keepAlive); - _mqttClient.setCleanSession(_state.cleanSession); - _mqttClient.setMaxTopicLength(_state.maxTopicLength); - _mqttClient.connect(); - } +} + +void MqttSettings::read(MqttSettings & settings, JsonObject & root) { + root["enabled"] = settings.enabled; + root["host"] = settings.host; + root["port"] = settings.port; + root["username"] = settings.username; + root["password"] = settings.password; + root["client_id"] = settings.clientId; + root["keep_alive"] = settings.keepAlive; + root["clean_session"] = settings.cleanSession; + root["max_topic_length"] = settings.maxTopicLength; + + // added by proddy for EMS-ESP + root["system_heartbeat"] = settings.system_heartbeat; + root["publish_time"] = settings.publish_time; + root["mqtt_format"] = settings.mqtt_format; + root["mqtt_qos"] = settings.mqtt_qos; +} + +StateUpdateResult MqttSettings::update(JsonObject & root, MqttSettings & settings) { + MqttSettings newSettings = {}; + + newSettings.enabled = root["enabled"] | FACTORY_MQTT_ENABLED; + newSettings.host = root["host"] | FACTORY_MQTT_HOST; + newSettings.port = root["port"] | FACTORY_MQTT_PORT; + newSettings.username = root["username"] | FACTORY_MQTT_USERNAME; + newSettings.password = root["password"] | FACTORY_MQTT_PASSWORD; + newSettings.clientId = root["client_id"] | FACTORY_MQTT_CLIENT_ID; + newSettings.keepAlive = root["keep_alive"] | FACTORY_MQTT_KEEP_ALIVE; + newSettings.cleanSession = root["clean_session"] | FACTORY_MQTT_CLEAN_SESSION; + newSettings.maxTopicLength = root["max_topic_length"] | FACTORY_MQTT_MAX_TOPIC_LENGTH; + + newSettings.system_heartbeat = root["system_heartbeat"] | EMSESP_DEFAULT_SYSTEM_HEARTBEAT; + newSettings.publish_time = root["publish_time"] | EMSESP_DEFAULT_PUBLISH_TIME; + newSettings.mqtt_format = root["mqtt_format"] | EMSESP_DEFAULT_MQTT_FORMAT; + newSettings.mqtt_qos = root["mqtt_qos"] | EMSESP_DEFAULT_MQTT_QOS; + + if (newSettings.system_heartbeat != settings.system_heartbeat) { + emsesp::EMSESP::system_.set_heartbeat(newSettings.system_heartbeat); + } + + if (newSettings.mqtt_qos != settings.mqtt_qos) { + emsesp::EMSESP::mqtt_.set_qos(newSettings.mqtt_qos); + emsesp::EMSESP::mqtt_.disconnect(); // force a disconnect & reconnect + } + + if (newSettings.publish_time != settings.publish_time) { + emsesp::EMSESP::mqtt_.set_publish_time(newSettings.publish_time); + } + + settings = newSettings; + + return StateUpdateResult::CHANGED; } diff --git a/lib/framework/MqttSettingsService.h b/lib/framework/MqttSettingsService.h index 91b3cb543..cdaa41abc 100644 --- a/lib/framework/MqttSettingsService.h +++ b/lib/framework/MqttSettingsService.h @@ -7,6 +7,9 @@ #include #include +#include "../../src/system.h" +#include "../../src/mqtt.h" + #define MQTT_RECONNECTION_DELAY 5000 #define MQTT_SETTINGS_FILE "/config/mqttSettings.json" @@ -34,6 +37,13 @@ #ifndef FACTORY_MQTT_CLIENT_ID #define FACTORY_MQTT_CLIENT_ID generateClientId() +static String generateClientId() { +#ifdef ESP32 + return ESPUtils::defaultDeviceValue("esp32-"); +#elif defined(ESP8266) + return ESPUtils::defaultDeviceValue("esp8266-"); +#endif +} #endif #ifndef FACTORY_MQTT_KEEP_ALIVE @@ -48,109 +58,91 @@ #define FACTORY_MQTT_MAX_TOPIC_LENGTH 128 #endif -static String generateClientId() { -#ifdef ESP32 - return ESPUtils::defaultDeviceValue("esp32-"); -#elif defined(ESP8266) - return ESPUtils::defaultDeviceValue("esp8266-"); -#endif -} +#define EMSESP_DEFAULT_SYSTEM_HEARTBEAT true +#define EMSESP_DEFAULT_MQTT_FORMAT 2 // nested +#define EMSESP_DEFAULT_MQTT_QOS 0 +#define EMSESP_DEFAULT_PUBLISH_TIME 10 + class MqttSettings { - public: - // host and port - if enabled - bool enabled; - String host; - uint16_t port; + public: + // host and port - if enabled + bool enabled; + String host; + uint16_t port; - // username and password - String username; - String password; + // username and password + String username; + String password; - // client id settings - String clientId; + // client id settings + String clientId; - // connection settings - uint16_t keepAlive; - bool cleanSession; - uint16_t maxTopicLength; + // connection settings + uint16_t keepAlive; + bool cleanSession; + uint16_t maxTopicLength; - static void read(MqttSettings& settings, JsonObject& root) { - root["enabled"] = settings.enabled; - root["host"] = settings.host; - root["port"] = settings.port; - root["username"] = settings.username; - root["password"] = settings.password; - root["client_id"] = settings.clientId; - root["keep_alive"] = settings.keepAlive; - root["clean_session"] = settings.cleanSession; - root["max_topic_length"] = settings.maxTopicLength; - } + // proddy EMS-ESP specific + uint16_t publish_time; // seconds + uint8_t mqtt_format; // 1=single, 2=nested, 3=ha, 4=custom + uint8_t mqtt_qos; + bool system_heartbeat; - static StateUpdateResult update(JsonObject& root, MqttSettings& settings) { - settings.enabled = root["enabled"] | FACTORY_MQTT_ENABLED; - settings.host = root["host"] | FACTORY_MQTT_HOST; - settings.port = root["port"] | FACTORY_MQTT_PORT; - settings.username = root["username"] | FACTORY_MQTT_USERNAME; - settings.password = root["password"] | FACTORY_MQTT_PASSWORD; - settings.clientId = root["client_id"] | FACTORY_MQTT_CLIENT_ID; - settings.keepAlive = root["keep_alive"] | FACTORY_MQTT_KEEP_ALIVE; - settings.cleanSession = root["clean_session"] | FACTORY_MQTT_CLEAN_SESSION; - settings.maxTopicLength = root["max_topic_length"] | FACTORY_MQTT_MAX_TOPIC_LENGTH; - return StateUpdateResult::CHANGED; - } + static void read(MqttSettings & settings, JsonObject & root); + static StateUpdateResult update(JsonObject & root, MqttSettings & settings); }; class MqttSettingsService : public StatefulService { - public: - MqttSettingsService(AsyncWebServer* server, FS* fs, SecurityManager* securityManager); - ~MqttSettingsService(); + public: + MqttSettingsService(AsyncWebServer * server, FS * fs, SecurityManager * securityManager); + ~MqttSettingsService(); - void begin(); - void loop(); - bool isEnabled(); - bool isConnected(); - const char* getClientId(); - AsyncMqttClientDisconnectReason getDisconnectReason(); - AsyncMqttClient* getMqttClient(); + void begin(); + void loop(); + bool isEnabled(); + bool isConnected(); + const char * getClientId(); + AsyncMqttClientDisconnectReason getDisconnectReason(); + AsyncMqttClient * getMqttClient(); - protected: - void onConfigUpdated(); + protected: + void onConfigUpdated(); - private: - HttpEndpoint _httpEndpoint; - FSPersistence _fsPersistence; + private: + HttpEndpoint _httpEndpoint; + FSPersistence _fsPersistence; - // Pointers to hold retained copies of the mqtt client connection strings. - // This is required as AsyncMqttClient holds references to the supplied connection strings. - char* _retainedHost; - char* _retainedClientId; - char* _retainedUsername; - char* _retainedPassword; + // Pointers to hold retained copies of the mqtt client connection strings. + // This is required as AsyncMqttClient holds references to the supplied connection strings. + char * _retainedHost; + char * _retainedClientId; + char * _retainedUsername; + char * _retainedPassword; - // variable to help manage connection - bool _reconfigureMqtt; - unsigned long _disconnectedAt; + // variable to help manage connection + bool _reconfigureMqtt; + unsigned long _disconnectedAt; - // connection status - AsyncMqttClientDisconnectReason _disconnectReason; + // connection status + AsyncMqttClientDisconnectReason _disconnectReason; - // the MQTT client instance - AsyncMqttClient _mqttClient; + // the MQTT client instance + AsyncMqttClient _mqttClient; #ifdef ESP32 - void onStationModeGotIP(WiFiEvent_t event, WiFiEventInfo_t info); - void onStationModeDisconnected(WiFiEvent_t event, WiFiEventInfo_t info); + void onStationModeGotIP(WiFiEvent_t event, WiFiEventInfo_t info); + void onStationModeDisconnected(WiFiEvent_t event, WiFiEventInfo_t info); #elif defined(ESP8266) - WiFiEventHandler _onStationModeDisconnectedHandler; - WiFiEventHandler _onStationModeGotIPHandler; - void onStationModeGotIP(const WiFiEventStationModeGotIP& event); - void onStationModeDisconnected(const WiFiEventStationModeDisconnected& event); + WiFiEventHandler _onStationModeDisconnectedHandler; + WiFiEventHandler _onStationModeGotIPHandler; + void onStationModeGotIP(const WiFiEventStationModeGotIP & event); + void onStationModeDisconnected(const WiFiEventStationModeDisconnected & event); #endif - void onMqttConnect(bool sessionPresent); - void onMqttDisconnect(AsyncMqttClientDisconnectReason reason); - void configureMqtt(); + void onMqttConnect(bool sessionPresent); + void onMqttDisconnect(AsyncMqttClientDisconnectReason reason); + void configureMqtt(); }; -#endif // end MqttSettingsService_h +#endif // end MqttSettingsService_h diff --git a/lib/framework/MqttStatus.cpp b/lib/framework/MqttStatus.cpp index 8f5bac340..30f4f8f47 100644 --- a/lib/framework/MqttStatus.cpp +++ b/lib/framework/MqttStatus.cpp @@ -1,24 +1,23 @@ #include -MqttStatus::MqttStatus(AsyncWebServer* server, - MqttSettingsService* mqttSettingsService, - SecurityManager* securityManager) : - _mqttSettingsService(mqttSettingsService) { - server->on(MQTT_STATUS_SERVICE_PATH, - HTTP_GET, - securityManager->wrapRequest(std::bind(&MqttStatus::mqttStatus, this, std::placeholders::_1), - AuthenticationPredicates::IS_AUTHENTICATED)); +MqttStatus::MqttStatus(AsyncWebServer * server, MqttSettingsService * mqttSettingsService, SecurityManager * securityManager) + : _mqttSettingsService(mqttSettingsService) { + server->on(MQTT_STATUS_SERVICE_PATH, + HTTP_GET, + securityManager->wrapRequest(std::bind(&MqttStatus::mqttStatus, this, std::placeholders::_1), AuthenticationPredicates::IS_AUTHENTICATED)); } -void MqttStatus::mqttStatus(AsyncWebServerRequest* request) { - AsyncJsonResponse* response = new AsyncJsonResponse(false, MAX_MQTT_STATUS_SIZE); - JsonObject root = response->getRoot(); +void MqttStatus::mqttStatus(AsyncWebServerRequest * request) { + AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_MQTT_STATUS_SIZE); + JsonObject root = response->getRoot(); - root["enabled"] = _mqttSettingsService->isEnabled(); - root["connected"] = _mqttSettingsService->isConnected(); - root["client_id"] = _mqttSettingsService->getClientId(); - root["disconnect_reason"] = (uint8_t)_mqttSettingsService->getDisconnectReason(); + root["enabled"] = _mqttSettingsService->isEnabled(); + root["connected"] = _mqttSettingsService->isConnected(); + root["client_id"] = _mqttSettingsService->getClientId(); + root["disconnect_reason"] = (uint8_t)_mqttSettingsService->getDisconnectReason(); - response->setLength(); - request->send(response); + root["mqtt_fails"] = emsesp::Mqtt::publish_fails(); + + response->setLength(); + request->send(response); } diff --git a/lib/framework/MqttStatus.h b/lib/framework/MqttStatus.h index a726d3b55..4cfc6cfbf 100644 --- a/lib/framework/MqttStatus.h +++ b/lib/framework/MqttStatus.h @@ -9,6 +9,8 @@ #include #endif +#include "../../src/mqtt.h" + #include #include #include @@ -19,13 +21,13 @@ #define MQTT_STATUS_SERVICE_PATH "/rest/mqttStatus" class MqttStatus { - public: - MqttStatus(AsyncWebServer* server, MqttSettingsService* mqttSettingsService, SecurityManager* securityManager); + public: + MqttStatus(AsyncWebServer * server, MqttSettingsService * mqttSettingsService, SecurityManager * securityManager); - private: - MqttSettingsService* _mqttSettingsService; + private: + MqttSettingsService * _mqttSettingsService; - void mqttStatus(AsyncWebServerRequest* request); + void mqttStatus(AsyncWebServerRequest * request); }; -#endif // end MqttStatus_h +#endif // end MqttStatus_h diff --git a/lib/framework/SystemStatus.cpp b/lib/framework/SystemStatus.cpp index 89484349f..9a083dc9f 100644 --- a/lib/framework/SystemStatus.cpp +++ b/lib/framework/SystemStatus.cpp @@ -1,45 +1,47 @@ #include -SystemStatus::SystemStatus(AsyncWebServer* server, SecurityManager* securityManager) { - server->on(SYSTEM_STATUS_SERVICE_PATH, - HTTP_GET, - securityManager->wrapRequest(std::bind(&SystemStatus::systemStatus, this, std::placeholders::_1), - AuthenticationPredicates::IS_AUTHENTICATED)); +SystemStatus::SystemStatus(AsyncWebServer * server, SecurityManager * securityManager) { + server->on(SYSTEM_STATUS_SERVICE_PATH, + HTTP_GET, + securityManager->wrapRequest(std::bind(&SystemStatus::systemStatus, this, std::placeholders::_1), AuthenticationPredicates::IS_AUTHENTICATED)); } -void SystemStatus::systemStatus(AsyncWebServerRequest* request) { - AsyncJsonResponse* response = new AsyncJsonResponse(false, MAX_ESP_STATUS_SIZE); - JsonObject root = response->getRoot(); +void SystemStatus::systemStatus(AsyncWebServerRequest * request) { + AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_ESP_STATUS_SIZE); + JsonObject root = response->getRoot(); #ifdef ESP32 - root["esp_platform"] = "esp32"; - root["max_alloc_heap"] = ESP.getMaxAllocHeap(); - root["psram_size"] = ESP.getPsramSize(); - root["free_psram"] = ESP.getFreePsram(); + root["esp_platform"] = "esp32"; + root["max_alloc_heap"] = ESP.getMaxAllocHeap(); + root["psram_size"] = ESP.getPsramSize(); + root["free_psram"] = ESP.getFreePsram(); #elif defined(ESP8266) - root["esp_platform"] = "esp8266"; - root["max_alloc_heap"] = ESP.getMaxFreeBlockSize(); - root["heap_fragmentation"] = ESP.getHeapFragmentation(); + root["esp_platform"] = "esp8266"; + root["max_alloc_heap"] = ESP.getMaxFreeBlockSize(); + root["heap_fragmentation"] = ESP.getHeapFragmentation(); #endif - root["cpu_freq_mhz"] = ESP.getCpuFreqMHz(); - root["free_heap"] = ESP.getFreeHeap(); - root["sketch_size"] = ESP.getSketchSize(); - root["free_sketch_space"] = ESP.getFreeSketchSpace(); - root["sdk_version"] = ESP.getSdkVersion(); - root["flash_chip_size"] = ESP.getFlashChipSize(); - root["flash_chip_speed"] = ESP.getFlashChipSpeed(); + root["cpu_freq_mhz"] = ESP.getCpuFreqMHz(); + root["free_heap"] = ESP.getFreeHeap(); + root["sketch_size"] = ESP.getSketchSize(); + root["free_sketch_space"] = ESP.getFreeSketchSpace(); + root["sdk_version"] = ESP.getSdkVersion(); + root["flash_chip_size"] = ESP.getFlashChipSize(); + root["flash_chip_speed"] = ESP.getFlashChipSpeed(); // TODO - Ideally this class will take an *FS and extract the file system information from there. // ESP8266 and ESP32 do not have feature parity in FS.h which currently makes that difficult. #ifdef ESP32 - root["fs_total"] = SPIFFS.totalBytes(); - root["fs_used"] = SPIFFS.usedBytes(); + root["fs_total"] = SPIFFS.totalBytes(); + root["fs_used"] = SPIFFS.usedBytes(); #elif defined(ESP8266) - FSInfo fs_info; - LittleFS.info(fs_info); // TODO added littlefs - root["fs_total"] = fs_info.totalBytes; - root["fs_used"] = fs_info.usedBytes; + FSInfo fs_info; + LittleFS.info(fs_info); // TODO added littlefs + root["fs_total"] = fs_info.totalBytes; + root["fs_used"] = fs_info.usedBytes; #endif - response->setLength(); - request->send(response); + root["uptime"] = uuid::log::format_timestamp_ms(uuid::get_uptime_ms(), 3); + root["free_mem"] = emsesp::System::free_mem(); + + response->setLength(); + request->send(response); } diff --git a/lib/framework/SystemStatus.h b/lib/framework/SystemStatus.h index 998d5e55b..7fa487bd5 100644 --- a/lib/framework/SystemStatus.h +++ b/lib/framework/SystemStatus.h @@ -17,15 +17,18 @@ #include #include +#include +#include "../../src/system.h" + #define MAX_ESP_STATUS_SIZE 1024 #define SYSTEM_STATUS_SERVICE_PATH "/rest/systemStatus" class SystemStatus { - public: - SystemStatus(AsyncWebServer* server, SecurityManager* securityManager); + public: + SystemStatus(AsyncWebServer * server, SecurityManager * securityManager); - private: - void systemStatus(AsyncWebServerRequest* request); + private: + void systemStatus(AsyncWebServerRequest * request); }; -#endif // end SystemStatus_h +#endif // end SystemStatus_h diff --git a/src/EMSESPSettingsService.cpp b/src/EMSESPSettingsService.cpp index 3ab625082..0adac9027 100644 --- a/src/EMSESPSettingsService.cpp +++ b/src/EMSESPSettingsService.cpp @@ -9,64 +9,38 @@ EMSESPSettingsService::EMSESPSettingsService(AsyncWebServer * server, FS * fs, S } void EMSESPSettings::read(EMSESPSettings & settings, JsonObject & root) { - root["tx_mode"] = settings.tx_mode; - root["ems_bus_id"] = settings.ems_bus_id; - root["system_heartbeat"] = settings.system_heartbeat; + root["tx_mode"] = settings.tx_mode; + root["ems_bus_id"] = settings.ems_bus_id; + root["syslog_level"] = settings.syslog_level; root["syslog_mark_interval"] = settings.syslog_mark_interval; root["syslog_host"] = settings.syslog_host; - root["master_thermostat"] = settings.master_thermostat; - root["shower_timer"] = settings.shower_timer; - root["shower_alert"] = settings.shower_alert; - root["publish_time"] = settings.publish_time; - root["mqtt_format"] = settings.mqtt_format; - root["mqtt_qos"] = settings.mqtt_qos; + + root["master_thermostat"] = settings.master_thermostat; + root["shower_timer"] = settings.shower_timer; + root["shower_alert"] = settings.shower_alert; } StateUpdateResult EMSESPSettings::update(JsonObject & root, EMSESPSettings & settings) { - EMSESPSettings newSettings = {}; - newSettings.tx_mode = root["tx_mode"] | EMSESP_DEFAULT_TX_MODE; - newSettings.ems_bus_id = root["ems_bus_id"] | EMSESP_DEFAULT_EMS_BUS_ID; - newSettings.system_heartbeat = root["system_heartbeat"] | EMSESP_DEFAULT_SYSTEM_HEARTBEAT; + EMSESPSettings newSettings = {}; + newSettings.tx_mode = root["tx_mode"] | EMSESP_DEFAULT_TX_MODE; + newSettings.ems_bus_id = root["ems_bus_id"] | EMSESP_DEFAULT_EMS_BUS_ID; + newSettings.syslog_level = root["syslog_level"] | EMSESP_DEFAULT_SYSLOG_LEVEL; newSettings.syslog_mark_interval = root["syslog_mark_interval"] | EMSESP_DEFAULT_SYSLOG_MARK_INTERVAL; newSettings.syslog_host = root["syslog_host"] | EMSESP_DEFAULT_SYSLOG_HOST; - newSettings.master_thermostat = root["master_thermostat"] | EMSESP_DEFAULT_MASTER_THERMOSTAT; - newSettings.shower_timer = root["shower_timer"] | EMSESP_DEFAULT_SHOWER_TIMER; - newSettings.shower_alert = root["shower_alert"] | EMSESP_DEFAULT_SHOWER_ALERT; - newSettings.publish_time = root["publish_time"] | EMSESP_DEFAULT_PUBLISH_TIME; - newSettings.mqtt_format = root["mqtt_format"] | EMSESP_DEFAULT_MQTT_FORMAT; - newSettings.mqtt_qos = root["mqtt_qos"] | EMSESP_DEFAULT_MQTT_QOS; + + newSettings.master_thermostat = root["master_thermostat"] | EMSESP_DEFAULT_MASTER_THERMOSTAT; + newSettings.shower_timer = root["shower_timer"] | EMSESP_DEFAULT_SHOWER_TIMER; + newSettings.shower_alert = root["shower_alert"] | EMSESP_DEFAULT_SHOWER_ALERT; bool changed = false; - // changing master thermostat, bus ID, mqtt_format requires a reboot - if ((newSettings.master_thermostat != settings.master_thermostat) || (newSettings.ems_bus_id != settings.ems_bus_id) - || (newSettings.mqtt_format != settings.mqtt_format)) { - changed = true; - } - - if (newSettings.system_heartbeat != settings.system_heartbeat) { - EMSESP::system_.set_heartbeat(newSettings.system_heartbeat); - changed = true; - } - if (newSettings.tx_mode != settings.tx_mode) { EMSESP::reset_tx(newSettings.tx_mode); // reset counters changed = true; } - if (newSettings.mqtt_qos != settings.mqtt_qos) { - EMSESP::mqtt_.set_qos(newSettings.mqtt_qos); - EMSESP::mqtt_.disconnect(); // force a disconnect & reconnect - changed = true; - } - - if (newSettings.publish_time != settings.publish_time) { - EMSESP::mqtt_.set_publish_time(newSettings.publish_time); - changed = true; - } - if ((newSettings.shower_timer != settings.shower_timer) || (newSettings.shower_alert != settings.shower_alert)) { EMSESP::shower_.start(); changed = true; diff --git a/src/EMSESPSettingsService.h b/src/EMSESPSettingsService.h index 96ba9abad..9d37668f8 100644 --- a/src/EMSESPSettingsService.h +++ b/src/EMSESPSettingsService.h @@ -9,21 +9,14 @@ #define EMSESP_DEFAULT_TX_MODE 1 #define EMSESP_DEFAULT_EMS_BUS_ID 0x0B // service key -#define EMSESP_DEFAULT_SYSTEM_HEARTBEAT true + #define EMSESP_DEFAULT_SYSLOG_LEVEL -1 #define EMSESP_DEFAULT_SYSLOG_MARK_INTERVAL 0 #define EMSESP_DEFAULT_SYSLOG_HOST "" + #define EMSESP_DEFAULT_MASTER_THERMOSTAT 0 // not set #define EMSESP_DEFAULT_SHOWER_TIMER false #define EMSESP_DEFAULT_SHOWER_ALERT false -#define EMSESP_DEFAULT_MQTT_FORMAT 2 // nested -#define EMSESP_DEFAULT_MQTT_QOS 0 - -#ifndef EMSESP_STANDALONE -#define EMSESP_DEFAULT_PUBLISH_TIME 10 -#else -#define EMSESP_DEFAULT_PUBLISH_TIME 0 -#endif namespace emsesp { @@ -31,18 +24,16 @@ enum MQTT_format : uint8_t { SINGLE = 1, NESTED, HA, CUSTOM }; class EMSESPSettings { public: - uint8_t tx_mode; - uint8_t ems_bus_id; - bool system_heartbeat; + uint8_t tx_mode; + uint8_t ems_bus_id; + uint8_t master_thermostat; + bool shower_timer; + bool shower_alert; + + // syslog int8_t syslog_level; // uuid::log::Level uint32_t syslog_mark_interval; String syslog_host; - uint8_t master_thermostat; - bool shower_timer; - bool shower_alert; - uint16_t publish_time; // seconds - uint8_t mqtt_format; // 1=single, 2=nested, 3=ha, 4=custom - uint8_t mqtt_qos; static void read(EMSESPSettings & settings, JsonObject & root); static StateUpdateResult update(JsonObject & root, EMSESPSettings & settings); diff --git a/src/EMSESPStatusService.cpp b/src/EMSESPStatusService.cpp index 773f87fe7..34f0de072 100644 --- a/src/EMSESPStatusService.cpp +++ b/src/EMSESPStatusService.cpp @@ -61,9 +61,6 @@ void EMSESPStatusService::emsespStatusService(AsyncWebServerRequest * request) { root["tx_sent"] = EMSESP::txservice_.telegram_read_count() + EMSESP::txservice_.telegram_write_count(); root["crc_errors"] = EMSESP::rxservice_.telegram_error_count(); root["tx_errors"] = EMSESP::txservice_.telegram_fail_count(); - root["mqtt_fails"] = Mqtt::publish_fails(); - root["uptime"] = uuid::log::format_timestamp_ms(uuid::get_uptime_ms(), 3); - root["free_mem"] = System::free_mem(); response->setLength(); request->send(response); diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp index 100b1b169..d43876389 100644 --- a/src/devices/thermostat.cpp +++ b/src/devices/thermostat.cpp @@ -126,10 +126,13 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i } } - uint8_t master_thermostat; + uint8_t master_thermostat = 0; EMSESP::emsespSettingsService.read([&](EMSESPSettings & settings) { master_thermostat = settings.master_thermostat; // what the user has defined - mqtt_format_ = settings.mqtt_format; // single, nested or ha + }); + + EMSESP::esp8266React.getMqttSettingsService()->read([&](MqttSettings & settings) { + mqtt_format_ = settings.mqtt_format; // single, nested or ha }); uint8_t actual_master_thermostat = EMSESP::actual_master_thermostat(); // what we're actually using diff --git a/src/mqtt.cpp b/src/mqtt.cpp index e83a4960f..bf6f519ee 100644 --- a/src/mqtt.cpp +++ b/src/mqtt.cpp @@ -247,11 +247,9 @@ void Mqtt::start(AsyncMqttClient * mqttClient) { EMSESP::esp8266React.getWiFiSettingsService()->read([&](WiFiSettings & wifiSettings) { hostname_ = wifiSettings.hostname.c_str(); }); // fetch MQTT settings - // EMSESP::esp8266React.getMqttSettingsService()->read([&](MqttSettings & mqttSettings) { mqtt_enabled_ = mqttSettings.enabled; }); - - EMSESP::emsespSettingsService.read([&](EMSESPSettings & settings) { - publish_time_ = settings.publish_time * 1000; // convert to milliseconds - mqtt_qos_ = settings.mqtt_qos; + EMSESP::esp8266React.getMqttSettingsService()->read([&](MqttSettings & mqttSettings) { + publish_time_ = mqttSettings.publish_time * 1000; // convert to milliseconds + mqtt_qos_ = mqttSettings.mqtt_qos; }); #ifndef EMSESP_STANDALONE diff --git a/src/sensors.cpp b/src/sensors.cpp index 365771c39..c09b71b05 100644 --- a/src/sensors.cpp +++ b/src/sensors.cpp @@ -29,7 +29,7 @@ uuid::log::Logger Sensors::logger_{F_(logger_name), uuid::log::Facility::DAEMON} void Sensors::start() { // copy over values from MQTT so we don't keep on quering the filesystem - EMSESP::emsespSettingsService.read([&](EMSESPSettings & settings) { + EMSESP::esp8266React.getMqttSettingsService()->read([&](MqttSettings & settings) { mqtt_format_ = settings.mqtt_format; // single, nested or ha }); diff --git a/src/system.cpp b/src/system.cpp index b9ca17ff9..361a67291 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -225,10 +225,9 @@ void System::start() { } // fetch settings - EMSESP::emsespSettingsService.read([&](EMSESPSettings & settings) { - tx_mode_ = settings.tx_mode; - system_heartbeat_ = settings.system_heartbeat; - }); + EMSESP::emsespSettingsService.read([&](EMSESPSettings & settings) { tx_mode_ = settings.tx_mode; }); + + EMSESP::esp8266React.getMqttSettingsService()->read([&](MqttSettings & settings) { system_heartbeat_ = settings.system_heartbeat; }); syslog_init(); @@ -596,7 +595,9 @@ void System::console_commands(Shell & shell, unsigned int context) { shell.print(" "); shell.printfln(F_(mark_interval_fmt), settings.syslog_mark_interval); shell.println(); - shell.printfln(F_(system_heartbeat_fmt), settings.system_heartbeat ? F_(enabled) : F_(disabled)); + bool system_heartbeat; + EMSESP::esp8266React.getMqttSettingsService()->read([&](MqttSettings & settings) { system_heartbeat = settings.system_heartbeat; }); + shell.printfln(F_(system_heartbeat_fmt), system_heartbeat ? F_(enabled) : F_(disabled)); }); } });