show device info on Web

src/devices/boiler.cpp

@@ -166,6 +166,24 @@ void Boiler::boiler_cmd_wwtemp(const char * message) {
     }
 }
 
+void Boiler::device_info(JsonArray & root) {
+    JsonObject dataElement;
+
+    dataElement          = root.createNestedObject();
+    dataElement["name"]  = F("Hot tap water");
+    dataElement["value"] = tap_water_active_ ? F("running") : F("off");
+
+    dataElement          = root.createNestedObject();
+    dataElement["name"]  = F("Central heating");
+    dataElement["value"] = heating_active_ ? F("active") : F("off");
+
+    render_value_json(root, "", F("Selected flow temperature"), selFlowTemp_, F_(degrees));
+    render_value_json(root, "", F("Current flow temperature"), curFlowTemp_, F_(degrees), 10);
+    render_value_json(root, "", F("Warm Water selected temperature"), wWSelTemp_, F_(degrees));
+    render_value_json(root, "", F("Warm Water set temperature"), wWSetTmp_, F_(degrees));
+    render_value_json(root, "", F("Warm Water current temperature (intern)"), wWCurTmp_, F_(degrees), 10);
+}
+
 // publish values via MQTT
 void Boiler::publish_values() {
     const size_t        capacity = JSON_OBJECT_SIZE(47); // must recalculate if more objects addded https://arduinojson.org/v6/assistant/

src/devices/boiler.h

@@ -40,6 +40,7 @@ class Boiler : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
+    virtual void device_info(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();
 

src/devices/connect.cpp

@@ -34,6 +34,9 @@ Connect::Connect(uint8_t device_type, uint8_t device_id, uint8_t product_id, con
     // register_mqtt_topic("topic", std::bind(&Connect::cmd, this, _1));
 }
 
+void Connect::device_info(JsonArray & root) {
+}
+
 void Connect::add_context_menu() {
 }
 

src/devices/connect.h

@@ -37,6 +37,7 @@ class Connect : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
+    virtual void device_info(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();
 

src/devices/controller.cpp

@@ -39,6 +39,9 @@ Controller::Controller(uint8_t device_type, uint8_t device_id, uint8_t product_i
 void Controller::add_context_menu() {
 }
 
+void Controller::device_info(JsonArray & root) {
+}
+
 // display all values into the shell console
 void Controller::show_values(uuid::console::Shell & shell) {
     EMSdevice::show_values(shell); // always call this to show header

src/devices/controller.h

@@ -37,6 +37,7 @@ class Controller : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
+    virtual void device_info(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();
 

src/devices/gateway.cpp

@@ -39,6 +39,9 @@ Gateway::Gateway(uint8_t device_type, uint8_t device_id, uint8_t product_id, con
 void Gateway::add_context_menu() {
 }
 
+void Gateway::device_info(JsonArray & root) {
+}
+
 // display all values into the shell console
 void Gateway::show_values(uuid::console::Shell & shell) {
     EMSdevice::show_values(shell); // always call this to show header

src/devices/gateway.h

@@ -37,6 +37,7 @@ class Gateway : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
+    virtual void device_info(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();
 

src/devices/heatpump.cpp

@@ -50,6 +50,9 @@ Heatpump::Heatpump(uint8_t device_type, uint8_t device_id, uint8_t product_id, c
 void Heatpump::add_context_menu() {
 }
 
+void Heatpump::device_info(JsonArray & root) {
+}
+
 // display all values into the shell console
 void Heatpump::show_values(uuid::console::Shell & shell) {
     EMSdevice::show_values(shell); // always call this to show header

src/devices/heatpump.h

@@ -37,6 +37,7 @@ class Heatpump : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
+    virtual void device_info(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();
 

src/devices/mixing.cpp

@@ -57,6 +57,9 @@ Mixing::Mixing(uint8_t device_type, uint8_t device_id, uint8_t product_id, const
 void Mixing::add_context_menu() {
 }
 
+void Mixing::device_info(JsonArray & root) {
+}
+
 // check to see if values have been updated
 bool Mixing::updated_values() {
     return false;

src/devices/mixing.h

@@ -37,6 +37,7 @@ class Mixing : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
+    virtual void device_info(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();
 

src/devices/solar.cpp

@@ -58,6 +58,9 @@ Solar::Solar(uint8_t device_type, uint8_t device_id, uint8_t product_id, const s
 void Solar::add_context_menu() {
 }
 
+void Solar::device_info(JsonArray & root) {
+}
+
 // display all values into the shell console
 void Solar::show_values(uuid::console::Shell & shell) {
     EMSdevice::show_values(shell); // always call this to show header

src/devices/solar.h

@@ -37,6 +37,7 @@ class Solar : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
+    virtual void device_info(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();
 

src/devices/switch.cpp

@@ -39,6 +39,9 @@ Switch::Switch(uint8_t device_type, uint8_t device_id, uint8_t product_id, const
 void Switch::add_context_menu() {
 }
 
+void Switch::device_info(JsonArray & root) {
+}
+
 // display all values into the shell console
 void Switch::show_values(uuid::console::Shell & shell) {
     EMSdevice::show_values(shell); // always call this to show header

src/devices/switch.h

@@ -37,6 +37,7 @@ class Switch : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
+    virtual void device_info(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();
 

src/devices/thermostat.cpp

@@ -169,6 +169,50 @@ void Thermostat::init_mqtt() {
     register_mqtt_topic("thermostat_cmd_mode", std::bind(&Thermostat::thermostat_cmd_mode, this, _1));
 }
 
+// prepare data for Web UI
+void Thermostat::device_info(JsonArray & root) {
+    JsonObject dataElement;
+
+    uint8_t flags = (this->flags() & 0x0F); // specific thermostat characteristics, strip the option bits
+
+    for (const auto & hc : heating_circuits_) {
+        if (!Helpers::hasValue(hc->setpoint_roomTemp)) {
+            break; // skip this HC
+        }
+
+        // different thermostat types store their temperature values differently
+        uint8_t format_setpoint, format_curr;
+        switch (flags) {
+        case EMS_DEVICE_FLAG_EASY:
+            format_setpoint = 100; // *100
+            format_curr     = 100; // *100
+            break;
+        case EMS_DEVICE_FLAG_JUNKERS:
+            format_setpoint = 10; // *10
+            format_curr     = 10; // *10
+            break;
+        default:                  // RC30, RC35 etc...
+            format_setpoint = 2;  // *2
+            format_curr     = 10; // *10
+            break;
+        }
+  
+        // create prefix with heating circuit number
+        std::string hc_str(5, '\0');
+        snprintf_P(&hc_str[0], hc_str.capacity() + 1, PSTR("hc%d: "), hc->hc_num());
+
+        render_value_json(root, hc_str, F("Current room temperature"), hc->curr_roomTemp, F_(degrees), format_curr);
+        render_value_json(root, hc_str, F("Setpoint room temperature"), hc->setpoint_roomTemp, F_(degrees), format_setpoint);
+        if (Helpers::hasValue(hc->mode)) {
+            dataElement = root.createNestedObject();
+            std::string mode_str(15, '\0');
+            snprintf_P(&mode_str[0], mode_str.capacity() + 1, PSTR("%sMode"), hc_str.c_str());
+            dataElement["name"]  = mode_str;
+            dataElement["value"] = mode_tostring(hc->get_mode(flags));
+        }
+    }
+}
+
 // only add the menu for the master thermostat
 void Thermostat::add_context_menu() {
     if (device_id() != EMSESP::actual_master_thermostat()) {
@@ -1024,8 +1068,6 @@ void Thermostat::show_values(uuid::console::Shell & shell) {
         }
     }
 
-    // std::sort(heating_circuits_.begin(), heating_circuits_.end()); // sort based on hc number. This has moved to the heating_circuit() function
-
     for (const auto & hc : heating_circuits_) {
         if (!Helpers::hasValue(hc->setpoint_roomTemp)) {
             break; // skip this HC

src/devices/thermostat.h

@@ -94,6 +94,7 @@ class Thermostat : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
+    virtual void device_info(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();