clean up merge conflicts
This commit is contained in:
parent
367e0f9b6e
commit
6ab706c87d
@ -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;
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user