From 5e7e80e39014e45d2a430e3cd9189b9b0ebd9090 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Sun, 25 Oct 2020 18:13:44 +0100 Subject: [PATCH] add missing values and formatings --- src/devices/boiler.cpp | 10 ++++++++-- src/locale_EN.h | 1 + src/system.cpp | 9 +++++---- src/test/test.cpp | 6 +++--- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index c7438c60b..afc66f2a8 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -138,6 +138,9 @@ void Boiler::register_mqtt_ha_config(bool force) { Mqtt::register_mqtt_ha_sensor(nullptr, nullptr, F_(setFlowTemp), this->device_type(), "setFlowTemp", F_(degrees), F_(icontemperature)); Mqtt::register_mqtt_ha_sensor(nullptr, nullptr, F_(setBurnPow), this->device_type(), "setBurnPow", F_(percent), F_(iconpercent)); Mqtt::register_mqtt_ha_sensor(nullptr, nullptr, F_(burnStarts), this->device_type(), "burnStarts", nullptr, nullptr); + Mqtt::register_mqtt_ha_sensor(nullptr, nullptr, F_(burnWorkMin), this->device_type(), "burnWorkMin", F_(min), nullptr); + Mqtt::register_mqtt_ha_sensor(nullptr, nullptr, F_(heatWorkMin), this->device_type(), "heatWorkMin", F_(min), nullptr); + Mqtt::register_mqtt_ha_sensor(nullptr, nullptr, F_(UBAuptime), this->device_type(), "UBAuptime", F_(min), nullptr); // ww Mqtt::register_mqtt_ha_sensor(nullptr, F_(mqtt_suffix_ww), F_(wWSelTemp), this->device_type(), "wWSelTemp", F_(degrees), F_(iconcruise)); @@ -165,7 +168,7 @@ void Boiler::register_mqtt_ha_config(bool force) { Mqtt::register_mqtt_ha_sensor(nullptr, F_(mqtt_suffix_ww), F_(wwMixTemperature), this->device_type(), "wwMixTemperature", F_(degrees), F_(icontemperature)); Mqtt::register_mqtt_ha_sensor(nullptr, F_(mqtt_suffix_ww), F_(wwBufferTemperature), this->device_type(), "wwBufferTemperature", F_(degrees), F_(icontemperature)); Mqtt::register_mqtt_ha_sensor(nullptr, F_(mqtt_suffix_ww), F_(wWStarts), this->device_type(), "wWStarts", nullptr, nullptr); - Mqtt::register_mqtt_ha_sensor(nullptr, F_(mqtt_suffix_ww), F_(wWWorkM), this->device_type(), "wWWorkM", nullptr, nullptr); + Mqtt::register_mqtt_ha_sensor(nullptr, F_(mqtt_suffix_ww), F_(wWWorkM), this->device_type(), "wWWorkM", F_(min), nullptr); mqtt_ha_config_ = true; // done } @@ -213,6 +216,9 @@ void Boiler::device_info_web(JsonArray & root) { print_value_json(root, F("setFlowTemp"), nullptr, F_(setFlowTemp), F_(degrees), json); print_value_json(root, F("setBurnPow"), nullptr, F_(setBurnPow), F_(percent), json); print_value_json(root, F("burnStarts"), nullptr, F_(burnStarts), nullptr, json); + print_value_json(root, F("burnWorkMin"), nullptr, F_(burnWorkMin), F_(min), json); + print_value_json(root, F("heatWorkMin"), nullptr, F_(heatWorkMin), F_(min), json); + print_value_json(root, F("UBAuptime"), nullptr, F_(UBAuptime), F_(min), json); // ww print_value_json(root, F("wWSelTemp"), nullptr, F_(wWSelTemp), F_(degrees), json); @@ -241,7 +247,7 @@ void Boiler::device_info_web(JsonArray & root) { print_value_json(root, F("wwMixTemperature"), nullptr, F_(wwMixTemperature), F_(degrees), json); print_value_json(root, F("wwBufferTemperature"), nullptr, F_(wwBufferTemperature), F_(degrees), json); print_value_json(root, F("wWStarts"), nullptr, F_(wWStarts), nullptr, json); - print_value_json(root, F("wWWorkM"), nullptr, F_(wWWorkM), nullptr, json); + print_value_json(root, F("wWWorkM"), nullptr, F_(wWWorkM), F_(min), json); } bool Boiler::export_values(JsonObject & json) { diff --git a/src/locale_EN.h b/src/locale_EN.h index 86b268414..a93a15b4a 100644 --- a/src/locale_EN.h +++ b/src/locale_EN.h @@ -200,6 +200,7 @@ MAKE_PSTR(setBurnPow, "Burner set power") MAKE_PSTR(burnStarts, "Burner starts") MAKE_PSTR(burnWorkMin, "Burner active time") MAKE_PSTR(heatWorkMin, "Heating active time") +MAKE_PSTR(UBAuptime, "Boiler total uptime") // solar MAKE_PSTR(collectorTemp, "Collector temperature (TS1)") diff --git a/src/system.cpp b/src/system.cpp index a32a48d0e..f5d3cf054 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -932,7 +932,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & json node["hide_led"] = Helpers::render_boolean(s, settings.hide_led); node["api_enabled"] = Helpers::render_boolean(s, settings.api_enabled); node["bool_format"] = settings.bool_format; - node["analog_enabled"] = settings.analog_enabled; + node["analog_enabled"] = Helpers::render_boolean(s, settings.analog_enabled); }); #endif @@ -956,6 +956,8 @@ bool System::command_report(const char * value, const int8_t id, JsonObject & js node = json.createNestedObject("Settings"); EMSESP::esp8266React.getMqttSettingsService()->read([&](MqttSettings & settings) { + char s[7]; + node["enabled"] = Helpers::render_boolean(s, settings.enabled); node["publish_time_boiler"] = settings.publish_time_boiler; node["publish_time_thermostat"] = settings.publish_time_thermostat; node["publish_time_solar"] = settings.publish_time_solar; @@ -964,8 +966,7 @@ bool System::command_report(const char * value, const int8_t id, JsonObject & js node["publish_time_sensor"] = settings.publish_time_sensor; node["mqtt_format"] = settings.mqtt_format; node["mqtt_qos"] = settings.mqtt_qos; - char s[7]; - node["mqtt_retain"] = Helpers::render_boolean(s, settings.mqtt_retain); + node["mqtt_retain"] = Helpers::render_boolean(s, settings.mqtt_retain); }); EMSESP::webSettingsService.read([&](WebSettings & settings) { @@ -981,7 +982,7 @@ bool System::command_report(const char * value, const int8_t id, JsonObject & js node["hide_led"] = Helpers::render_boolean(s, settings.hide_led); node["api_enabled"] = Helpers::render_boolean(s, settings.api_enabled); node["bool_format"] = settings.bool_format; - node["analog_enabled"] = settings.analog_enabled; + node["analog_enabled"] = Helpers::render_boolean(s, settings.analog_enabled); }); node = json.createNestedObject("Status"); diff --git a/src/test/test.cpp b/src/test/test.cpp index b37c58d6f..6a8d7f101 100644 --- a/src/test/test.cpp +++ b/src/test/test.cpp @@ -27,7 +27,7 @@ namespace emsesp { // used with the 'test' command, under su/admin void Test::run_test(uuid::console::Shell & shell, const std::string & command) { if (command == "default") { - run_test(shell, "mixing"); // add the default test case here + run_test(shell, "mixer"); // add the default test case here } if (command.empty()) { @@ -837,10 +837,10 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & command) { shell.invoke_command("show"); shell.invoke_command("call"); - shell.invoke_command("call mixing info"); + shell.invoke_command("call mixer info"); shell.invoke_command("publish"); shell.invoke_command("show mqtt"); - shell.invoke_command("call mixing"); + shell.invoke_command("call mixer"); } // finally dump to console