Merge branch 'PM_onDemand' into development
This commit is contained in:
commit
080a3eb29e
@ -97,8 +97,8 @@ void PowerMeterClass::onMqttMessage(const espMqttClientTypes::MessageProperties&
|
|||||||
float PowerMeterClass::getPowerTotal()
|
float PowerMeterClass::getPowerTotal()
|
||||||
{
|
{
|
||||||
CONFIG_T& config = Configuration.get();
|
CONFIG_T& config = Configuration.get();
|
||||||
if (!config.PowerMeter_Enabled
|
if (config.PowerMeter_Enabled
|
||||||
|| (millis() - _lastPowerMeterUpdate) < (1000)) {
|
&& (millis() - _lastPowerMeterUpdate) < (1000)) {
|
||||||
readPowerMeter();
|
readPowerMeter();
|
||||||
}
|
}
|
||||||
return _powerMeter1Power + _powerMeter2Power + _powerMeter3Power;
|
return _powerMeter1Power + _powerMeter2Power + _powerMeter3Power;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user