From e762abd18fb70cd1e0b59aedca674c1f8bed4eab Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Wed, 12 Oct 2022 00:17:40 +0200 Subject: [PATCH] Show RF chip type in SystemInfoView --- lib/Hoymiles/src/HoymilesRadio.cpp | 5 +++++ lib/Hoymiles/src/HoymilesRadio.h | 1 + src/WebApi_sysstatus.cpp | 1 + webapp/src/components/SystemInfoView.vue | 1 + webapp/src/components/partials/RadioInfo.vue | 13 +++++++++++++ 5 files changed, 21 insertions(+) diff --git a/lib/Hoymiles/src/HoymilesRadio.cpp b/lib/Hoymiles/src/HoymilesRadio.cpp index 8e26caa..8cbc6e1 100644 --- a/lib/Hoymiles/src/HoymilesRadio.cpp +++ b/lib/Hoymiles/src/HoymilesRadio.cpp @@ -169,6 +169,11 @@ bool HoymilesRadio::isConnected() return _radio->isChipConnected(); } +bool HoymilesRadio::isPVariant() +{ + return _radio->isPVariant(); +} + void HoymilesRadio::openReadingPipe() { serial_u s; diff --git a/lib/Hoymiles/src/HoymilesRadio.h b/lib/Hoymiles/src/HoymilesRadio.h index b60468c..1a29af9 100644 --- a/lib/Hoymiles/src/HoymilesRadio.h +++ b/lib/Hoymiles/src/HoymilesRadio.h @@ -47,6 +47,7 @@ public: bool isIdle(); bool isConnected(); + bool isPVariant(); template T* enqueCommand() diff --git a/src/WebApi_sysstatus.cpp b/src/WebApi_sysstatus.cpp index 36f71ed..2d6b298 100644 --- a/src/WebApi_sysstatus.cpp +++ b/src/WebApi_sysstatus.cpp @@ -66,6 +66,7 @@ void WebApiSysstatusClass::onSystemStatus(AsyncWebServerRequest* request) root[F("uptime")] = esp_timer_get_time() / 1000000; root[F("radio_connected")] = Hoymiles.getRadio()->isConnected(); + root[F("radio_pvariant")] = Hoymiles.getRadio()->isPVariant(); response->setLength(); request->send(response); diff --git a/webapp/src/components/SystemInfoView.vue b/webapp/src/components/SystemInfoView.vue index d028478..2891213 100644 --- a/webapp/src/components/SystemInfoView.vue +++ b/webapp/src/components/SystemInfoView.vue @@ -67,6 +67,7 @@ export default defineComponent({ sketch_used: 0, // RadioInfo radio_connected: false, + radio_pvariant: false, } } }, diff --git a/webapp/src/components/partials/RadioInfo.vue b/webapp/src/components/partials/RadioInfo.vue index 4d80360..8250f37 100644 --- a/webapp/src/components/partials/RadioInfo.vue +++ b/webapp/src/components/partials/RadioInfo.vue @@ -17,6 +17,18 @@ not connected + + Chip Type + + nRF24L01+ + nRF24L01 + Unknown + + @@ -30,6 +42,7 @@ import { defineComponent } from 'vue'; export default defineComponent({ props: { radio_connected: { type: Boolean, required: true }, + radio_pvariant: { type: Boolean, required: true }, }, });