patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up merge conflicts

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Hoymiles/src/Hoymiles.h
View File

@ -34,8 +34,8 @@ public:
HoymilesRadio_NRF* getRadioNrf(); HoymilesRadio_NRF* getRadioNrf();
HoymilesRadio_CMT* getRadioCmt(); HoymilesRadio_CMT* getRadioCmt();
uint32_t PollInterval() const const; uint32_t PollInterval() const;
void setPollInterval(const const uint32_t interval); void setPollInterval(const uint32_t interval);
void setVerboseLogging(bool verboseLogging); void setVerboseLogging(bool verboseLogging);
bool isAllRadioIdle() const; bool isAllRadioIdle() const;

2
src/PinMapping.cpp
View File

@ -305,7 +305,7 @@ bool PinMappingClass::isValidEthConfig() const
return _pinMapping.eth_enabled; return _pinMapping.eth_enabled;
} }
bool PinMappingClass::isValidHuaweiConfig() bool PinMappingClass::isValidHuaweiConfig() const
{ {
return _pinMapping.huawei_miso >= 0 return _pinMapping.huawei_miso >= 0
&& _pinMapping.huawei_mosi >= 0 && _pinMapping.huawei_mosi >= 0