clean up merge conflicts

This commit is contained in:
helgeerbe 2023-12-27 13:16:37 +01:00
parent 367e0f9b6e
commit 6ab706c87d
2 changed files with 3 additions and 3 deletions

View File

@ -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;

View File

@ -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