From fa703db41e3fe425730c103b8133672da3f2a910 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Wed, 7 Dec 2022 07:42:47 +0100 Subject: [PATCH] heartbeat time in standalone --- interface/package.json | 2 +- interface/src/i18n/de/index.ts | 2 +- lib_standalone/ESP8266React.h | 1 + mock-api/server.js | 1 + src/system.cpp | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/interface/package.json b/interface/package.json index 91afdb57e..4dbd7f5e9 100644 --- a/interface/package.json +++ b/interface/package.json @@ -8,7 +8,7 @@ "@emotion/styled": "^11.10.5", "@msgpack/msgpack": "^2.8.0", "@mui/icons-material": "^5.10.16", - "@mui/material": "^5.10.16", + "@mui/material": "^5.10.17", "@table-library/react-table-library": "4.0.23", "@types/lodash": "^4.14.191", "@types/node": "^18.11.11", diff --git a/interface/src/i18n/de/index.ts b/interface/src/i18n/de/index.ts index 3a4f450fd..dde8b25f4 100644 --- a/interface/src/i18n/de/index.ts +++ b/interface/src/i18n/de/index.ts @@ -248,7 +248,7 @@ const de: Translation = { MQTT_INT_HEARTBEAT: 'Heartbeat', MQTT_QUEUE: 'MQTT Queue', DEFAULT: 'Standard', - MQTT_MULTIPLE_INSTANCES: 'Enable Multiple Instances of EMS-ESP', + MQTT_MULTIPLE_INSTANCES: 'Erlaube EMS-ESP Mehrfachinstanzen', MQTT_CLEAN_SESSION: 'Setze `Clean Session`', MQTT_RETAIN_FLAG: 'Setze `Retain flag` immer', INACTIVE: 'Inaktiv', diff --git a/lib_standalone/ESP8266React.h b/lib_standalone/ESP8266React.h index 4587c8817..25973a224 100644 --- a/lib_standalone/ESP8266React.h +++ b/lib_standalone/ESP8266React.h @@ -89,6 +89,7 @@ class DummySettings { uint16_t publish_time_mixer = 10; uint16_t publish_time_other = 10; uint16_t publish_time_sensor = 10; + uint16_t publish_time_heartbeat = 60; String hostname = "ems-esp"; String jwtSecret = "ems-esp"; diff --git a/mock-api/server.js b/mock-api/server.js index 28315dfbc..ecf2f7927 100644 --- a/mock-api/server.js +++ b/mock-api/server.js @@ -226,6 +226,7 @@ mqtt_settings = { publish_time_mixer: 10, publish_time_other: 10, publish_time_sensor: 10, + publish_time_heartbeat: 60, mqtt_qos: 0, mqtt_retain: false, ha_enabled: true, diff --git a/src/system.cpp b/src/system.cpp index fe0ce91a9..1f9ccac9e 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -1154,6 +1154,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & outp node["ha enabled"] = settings.ha_enabled; node["mqtt qos"] = settings.mqtt_qos; node["mqtt retain"] = settings.mqtt_retain; + node["publish time heartbeat"] = settings.publish_time_heartbeat; node["publish time boiler"] = settings.publish_time_boiler; node["publish time thermostat"] = settings.publish_time_thermostat; node["publish time solar"] = settings.publish_time_solar;