From 670c2d6762768fb27e390ec1c5e7894ff3db94dd Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Sat, 18 Jun 2022 01:51:18 +0200 Subject: [PATCH] Show detected inverter type in webapp --- src/WebApi_inverter.cpp | 7 +++++++ webapp/src/components/InverterAdminView.vue | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/src/WebApi_inverter.cpp b/src/WebApi_inverter.cpp index c7a31f32..aac8f02b 100644 --- a/src/WebApi_inverter.cpp +++ b/src/WebApi_inverter.cpp @@ -41,6 +41,13 @@ void WebApiInverterClass::onInverterList(AsyncWebServerRequest* request) ((uint32_t)((config.Inverter[i].Serial >> 32) & 0xFFFFFFFF)), ((uint32_t)(config.Inverter[i].Serial & 0xFFFFFFFF))); obj[F("serial")] = buffer; + + auto inv = Hoymiles.getInverterBySerial(config.Inverter[i].Serial); + if (inv == nullptr) { + obj[F("type")] = F("Unknown"); + } else { + obj[F("type")] = inv->typeName(); + } } } diff --git a/webapp/src/components/InverterAdminView.vue b/webapp/src/components/InverterAdminView.vue index ebf25fe4..735dc4fb 100644 --- a/webapp/src/components/InverterAdminView.vue +++ b/webapp/src/components/InverterAdminView.vue @@ -47,6 +47,7 @@ Serial Name + Type Action @@ -68,6 +69,9 @@ maxlength="31" /> + + {{ editInverterData.type }} + @@ -84,6 +88,9 @@ {{ inverter.name }} + + {{ inverter.type }} + @@ -121,6 +128,7 @@ export default { id: "", serial: "", name: "", + type: "", }, inverters: [], alertMessage: "", @@ -199,6 +207,7 @@ export default { this.editId = inverter.id; this.editInverterData.serial = inverter.serial; this.editInverterData.name = inverter.name; + this.editInverterData.type = inverter.type; }, onCancel() { this.editId = "-1"; @@ -233,6 +242,7 @@ export default { this.editId = "-1"; this.editInverterData.serial = ""; this.editInverterData.name = ""; + this.editInverterData.type = ""; }, }, };