rename function device_info to device_info_web as it was a little confusing

This commit is contained in:
proddy
2020-09-07 11:00:53 +02:00
parent 897aa91229
commit 9f5849590c
21 changed files with 23 additions and 22 deletions

View File

@@ -40,7 +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 void device_info_web(JsonArray & root);
virtual bool updated_values();
virtual void add_context_menu();

View File

@@ -28,7 +28,7 @@ Connect::Connect(uint8_t device_type, uint8_t device_id, uint8_t product_id, con
: EMSdevice(device_type, device_id, product_id, version, name, flags, brand) {
}
void Connect::device_info(JsonArray & root) {
void Connect::device_info_web(JsonArray & root) {
}
void Connect::add_context_menu() {

View File

@@ -37,7 +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 void device_info_web(JsonArray & root);
virtual bool updated_values();
virtual void add_context_menu();

View File

@@ -31,7 +31,7 @@ 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) {
void Controller::device_info_web(JsonArray & root) {
}
// display all values into the shell console

View File

@@ -37,7 +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 void device_info_web(JsonArray & root);
virtual bool updated_values();
virtual void add_context_menu();

View File

@@ -31,7 +31,7 @@ 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) {
void Gateway::device_info_web(JsonArray & root) {
}
// display all values into the shell console

View File

@@ -37,7 +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 void device_info_web(JsonArray & root);
virtual bool updated_values();
virtual void add_context_menu();

View File

@@ -37,7 +37,7 @@ 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) {
void Heatpump::device_info_web(JsonArray & root) {
}
// display all values into the shell console

View File

@@ -37,7 +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 void device_info_web(JsonArray & root);
virtual bool updated_values();
virtual void add_context_menu();

View File

@@ -60,7 +60,7 @@ void Mixing::add_context_menu() {
}
// output json to web UI
void Mixing::device_info(JsonArray & root) {
void Mixing::device_info_web(JsonArray & root) {
if (type_ == Type::NONE) {
return; // don't have any values yet
}

View File

@@ -37,7 +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 void device_info_web(JsonArray & root);
virtual bool updated_values();
virtual void add_context_menu();

View File

@@ -54,7 +54,7 @@ void Solar::add_context_menu() {
}
// print to web
void Solar::device_info(JsonArray & root) {
void Solar::device_info_web(JsonArray & root) {
render_value_json(root, "", F("Collector temperature (TS1)"), collectorTemp_, F_(degrees), 10);
render_value_json(root, "", F("Tank bottom temperature (TS2)"), tankBottomTemp_, F_(degrees), 10);
render_value_json(root, "", F("Tank bottom temperature (TS5)"), tankBottomTemp2_, F_(degrees), 10);

View File

@@ -37,7 +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 void device_info_web(JsonArray & root);
virtual bool updated_values();
virtual void add_context_menu();

View File

@@ -31,7 +31,7 @@ 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) {
void Switch::device_info_web(JsonArray & root) {
}
// display all values into the shell console

View File

@@ -37,7 +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 void device_info_web(JsonArray & root);
virtual bool updated_values();
virtual void add_context_menu();

View File

@@ -163,7 +163,7 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
}
// prepare data for Web UI
void Thermostat::device_info(JsonArray & root) {
void Thermostat::device_info_web(JsonArray & root) {
uint8_t flags = this->model();
for (const auto & hc : heating_circuits_) {

View File

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