From 6ab706c87d901b462ae1e86ee1c74a546dbf7d8b Mon Sep 17 00:00:00 2001 From: helgeerbe Date: Wed, 27 Dec 2023 13:16:37 +0100 Subject: [PATCH] clean up merge conflicts --- lib/Hoymiles/src/Hoymiles.h | 4 ++-- src/PinMapping.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Hoymiles/src/Hoymiles.h b/lib/Hoymiles/src/Hoymiles.h index e6352838..86a7d6ca 100644 --- a/lib/Hoymiles/src/Hoymiles.h +++ b/lib/Hoymiles/src/Hoymiles.h @@ -34,8 +34,8 @@ public: HoymilesRadio_NRF* getRadioNrf(); HoymilesRadio_CMT* getRadioCmt(); - uint32_t PollInterval() const const; - void setPollInterval(const const uint32_t interval); + uint32_t PollInterval() const; + void setPollInterval(const uint32_t interval); void setVerboseLogging(bool verboseLogging); bool isAllRadioIdle() const; diff --git a/src/PinMapping.cpp b/src/PinMapping.cpp index 776cde8c..bf78e4ed 100644 --- a/src/PinMapping.cpp +++ b/src/PinMapping.cpp @@ -305,7 +305,7 @@ bool PinMappingClass::isValidEthConfig() const return _pinMapping.eth_enabled; } -bool PinMappingClass::isValidHuaweiConfig() +bool PinMappingClass::isValidHuaweiConfig() const { return _pinMapping.huawei_miso >= 0 && _pinMapping.huawei_mosi >= 0