andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 08:19:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

rename function device_info to device_info_web as it was a little confusing

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/EMSESPDevicesService.cpp
View File

@@ -81,7 +81,7 @@ void EMSESPDevicesService::device_data(AsyncWebServerRequest * request, JsonVari
AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_EMSESP_DEVICE_SIZE); AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_EMSESP_DEVICE_SIZE);
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
uint8_t id = json["id"]; // get id from selected table row uint8_t id = json["id"]; // get id from selected table row
EMSESP::device_info(id, (JsonObject &)response->getRoot()); EMSESP::device_info_web(id, (JsonObject &)response->getRoot());
#endif #endif
response->setLength(); response->setLength();
request->send(response); request->send(response);

2
src/devices/boiler.h
View File

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

2
src/devices/connect.cpp
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) { : 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() { void Connect::add_context_menu() {

2
src/devices/connect.h
View File

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

2
src/devices/controller.cpp
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::add_context_menu() {
} }
void Controller::device_info(JsonArray & root) { void Controller::device_info_web(JsonArray & root) {
} }
// display all values into the shell console // display all values into the shell console

2
src/devices/controller.h
View File

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

2
src/devices/gateway.cpp
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::add_context_menu() {
} }
void Gateway::device_info(JsonArray & root) { void Gateway::device_info_web(JsonArray & root) {
} }
// display all values into the shell console // display all values into the shell console

2
src/devices/gateway.h
View File

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

2
src/devices/heatpump.cpp
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::add_context_menu() {
} }
void Heatpump::device_info(JsonArray & root) { void Heatpump::device_info_web(JsonArray & root) {
} }
// display all values into the shell console // display all values into the shell console

2
src/devices/heatpump.h
View File

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

2
src/devices/mixing.cpp
View File

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

2
src/devices/mixing.h
View File

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

2
src/devices/solar.cpp
View File

@@ -54,7 +54,7 @@ void Solar::add_context_menu() {
} }
// print to web // 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("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 (TS2)"), tankBottomTemp_, F_(degrees), 10);
render_value_json(root, "", F("Tank bottom temperature (TS5)"), tankBottomTemp2_, F_(degrees), 10); render_value_json(root, "", F("Tank bottom temperature (TS5)"), tankBottomTemp2_, F_(degrees), 10);

2
src/devices/solar.h
View File

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

2
src/devices/switch.cpp
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::add_context_menu() {
} }
void Switch::device_info(JsonArray & root) { void Switch::device_info_web(JsonArray & root) {
} }
// display all values into the shell console // display all values into the shell console

2
src/devices/switch.h
View File

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

2
src/devices/thermostat.cpp
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 // prepare data for Web UI
void Thermostat::device_info(JsonArray & root) { void Thermostat::device_info_web(JsonArray & root) {
uint8_t flags = this->model(); uint8_t flags = this->model();
for (const auto & hc : heating_circuits_) { for (const auto & hc : heating_circuits_) {

2
src/devices/thermostat.h
View File

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

2
src/emsdevice.h
View File

@@ -140,7 +140,7 @@ class EMSdevice {
virtual void publish_values() = 0; virtual void publish_values() = 0;
virtual bool updated_values() = 0; virtual bool updated_values() = 0;
virtual void add_context_menu() = 0; virtual void add_context_menu() = 0;
virtual void device_info(JsonArray & root) = 0; virtual void device_info_web(JsonArray & root) = 0;
std::string telegram_type_name(std::shared_ptr<const Telegram> telegram); std::string telegram_type_name(std::shared_ptr<const Telegram> telegram);

5
src/emsesp.cpp
View File

@@ -541,13 +541,14 @@ bool EMSESP::process_telegram(std::shared_ptr<const Telegram> telegram) {
} }
// calls the device handler's function to populate a json doc with device info // calls the device handler's function to populate a json doc with device info
void EMSESP::device_info(const uint8_t unique_id, JsonObject & root) { // to be used in the Web UI
void EMSESP::device_info_web(const uint8_t unique_id, JsonObject & root) {
for (const auto & emsdevice : emsdevices) { for (const auto & emsdevice : emsdevices) {
if (emsdevice) { if (emsdevice) {
if (emsdevice->unique_id() == unique_id) { if (emsdevice->unique_id() == unique_id) {
root["deviceName"] = emsdevice->to_string_short(); // can;t use c_str() because of scope root["deviceName"] = emsdevice->to_string_short(); // can;t use c_str() because of scope
JsonArray data = root.createNestedArray("deviceData"); JsonArray data = root.createNestedArray("deviceData");
emsdevice->device_info(data); emsdevice->device_info_web(data);
return; return;
} }
} }

2
src/emsesp.h
View File

@@ -86,7 +86,7 @@ class EMSESP {
static void send_raw_telegram(const char * data); static void send_raw_telegram(const char * data);
static bool device_exists(const uint8_t device_id); static bool device_exists(const uint8_t device_id);
static void device_info(const uint8_t unique_id, JsonObject & root); static void device_info_web(const uint8_t unique_id, JsonObject & root);
static uint8_t count_devices(const uint8_t device_type); static uint8_t count_devices(const uint8_t device_type);