diff --git a/lib/Hoymiles/src/HoymilesRadio.cpp b/lib/Hoymiles/src/HoymilesRadio.cpp index 2cb82ab..117d45e 100644 --- a/lib/Hoymiles/src/HoymilesRadio.cpp +++ b/lib/Hoymiles/src/HoymilesRadio.cpp @@ -66,11 +66,6 @@ bool HoymilesRadio::isInitialized() return _isInitialized; } -bool HoymilesRadio::isConfigured() -{ - return _isConfigured; -} - bool HoymilesRadio::isIdle() { return !_busyFlag; diff --git a/lib/Hoymiles/src/HoymilesRadio.h b/lib/Hoymiles/src/HoymilesRadio.h index 18cef02..056b61c 100644 --- a/lib/Hoymiles/src/HoymilesRadio.h +++ b/lib/Hoymiles/src/HoymilesRadio.h @@ -13,7 +13,6 @@ public: bool isIdle(); bool isInitialized(); - bool isConfigured(); template T* enqueCommand() @@ -34,6 +33,5 @@ protected: serial_u _dtuSerial; std::queue> _commandQueue; bool _isInitialized = false; - bool _isConfigured = false; bool _busyFlag = false; }; \ No newline at end of file diff --git a/lib/Hoymiles/src/HoymilesRadio_CMT.cpp b/lib/Hoymiles/src/HoymilesRadio_CMT.cpp index 828de06..b083248 100644 --- a/lib/Hoymiles/src/HoymilesRadio_CMT.cpp +++ b/lib/Hoymiles/src/HoymilesRadio_CMT.cpp @@ -63,7 +63,6 @@ void HoymilesRadio_CMT::init(int8_t pin_sdio, int8_t pin_clk, int8_t pin_cs, int cmtSwitchDtuFreq(_inverterTargetFrequency); // start dtu at work freqency, for fast Rx if inverter is already on and frequency switched - _isConfigured = true; if (!_radio->isChipConnected()) { Hoymiles.getMessageOutput()->println("CMT: Connection error!!"); return; diff --git a/lib/Hoymiles/src/HoymilesRadio_NRF.cpp b/lib/Hoymiles/src/HoymilesRadio_NRF.cpp index d69522b..88b7dbb 100644 --- a/lib/Hoymiles/src/HoymilesRadio_NRF.cpp +++ b/lib/Hoymiles/src/HoymilesRadio_NRF.cpp @@ -23,7 +23,6 @@ void HoymilesRadio_NRF::init(SPIClass* initialisedSpiBus, uint8_t pinCE, uint8_t _radio->setAddressWidth(5); _radio->setRetries(0, 0); _radio->maskIRQ(true, true, false); // enable only receiving interrupts - _isConfigured = true; if (!_radio->isChipConnected()) { Hoymiles.getMessageOutput()->println("NRF: Connection error!!"); return; diff --git a/src/WebApi_sysstatus.cpp b/src/WebApi_sysstatus.cpp index 58c3820..58af907 100644 --- a/src/WebApi_sysstatus.cpp +++ b/src/WebApi_sysstatus.cpp @@ -5,6 +5,7 @@ #include "WebApi_sysstatus.h" #include "Configuration.h" #include "NetworkSettings.h" +#include "PinMapping.h" #include "WebApi.h" #include #include @@ -69,11 +70,11 @@ void WebApiSysstatusClass::onSystemStatus(AsyncWebServerRequest* request) root["uptime"] = esp_timer_get_time() / 1000000; - root["nrf_configured"] = Hoymiles.getRadioNrf()->isConfigured(); + root["nrf_configured"] = PinMapping.isValidNrf24Config(); root["nrf_connected"] = Hoymiles.getRadioNrf()->isConnected(); root["nrf_pvariant"] = Hoymiles.getRadioNrf()->isPVariant(); - root["cmt_configured"] = Hoymiles.getRadioCmt()->isConfigured(); + root["cmt_configured"] = PinMapping.isValidCmt2300Config(); root["cmt_connected"] = Hoymiles.getRadioCmt()->isConnected(); response->setLength();