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

fix: prevent getTotalPower() reading intermediate results

Browse Source 
the SDM power meter (among others) writes the power consumption of three
phases in multiple steps. this change helps to prevent getTotalPower()
reading intermediate values, e.g., reading a new value for phase 1 but
old values for phase 2 and 3 since phase 2 is currently read.

cache the values, and write them all at once, protected by a mutex,
later.

closes #732.
This commit is contained in:
Bernhard Kirchen 2024-03-11 22:52:54 +01:00 committed by Bernhard Kirchen
parent 13bc943dd5
commit 900326742c
2 changed files with 58 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/PowerMeter.h
View File

@ -6,6 +6,7 @@
#include <Arduino.h> #include <Arduino.h>
#include <map> #include <map>
#include <list> #include <list>
#include <mutex>
#include "SDM.h" #include "SDM.h"
#include "sml.h" #include "sml.h"
#include <TaskSchedulerDeclarations.h> #include <TaskSchedulerDeclarations.h>
@ -66,6 +67,8 @@ private:
std::map<String, float*> _mqttSubscriptions; std::map<String, float*> _mqttSubscriptions;
mutable std::mutex _mutex;
void readPowerMeter(); void readPowerMeter();
bool smlReadLoop(); bool smlReadLoop();

85
src/PowerMeter.cpp
View File

@ -108,30 +108,34 @@ float PowerMeterClass::getPowerTotal(bool forceUpdate)
readPowerMeter(); readPowerMeter();
} }
} }
std::lock_guard<std::mutex> l(_mutex);
return _powerMeter1Power + _powerMeter2Power + _powerMeter3Power; return _powerMeter1Power + _powerMeter2Power + _powerMeter3Power;
} }
uint32_t PowerMeterClass::getLastPowerMeterUpdate() uint32_t PowerMeterClass::getLastPowerMeterUpdate()
{ {
std::lock_guard<std::mutex> l(_mutex);
return _lastPowerMeterUpdate; return _lastPowerMeterUpdate;
} }
void PowerMeterClass::mqtt() void PowerMeterClass::mqtt()
{ {
if (!MqttSettings.getConnected()) { if (!MqttSettings.getConnected()) { return; }
return;
} else { String topic = "powermeter";
String topic = "powermeter"; auto totalPower = getPowerTotal();
MqttSettings.publish(topic + "/power1", String(_powerMeter1Power));
MqttSettings.publish(topic + "/power2", String(_powerMeter2Power)); std::lock_guard<std::mutex> l(_mutex);
MqttSettings.publish(topic + "/power3", String(_powerMeter3Power)); MqttSettings.publish(topic + "/power1", String(_powerMeter1Power));
MqttSettings.publish(topic + "/powertotal", String(getPowerTotal())); MqttSettings.publish(topic + "/power2", String(_powerMeter2Power));
MqttSettings.publish(topic + "/voltage1", String(_powerMeter1Voltage)); MqttSettings.publish(topic + "/power3", String(_powerMeter3Power));
MqttSettings.publish(topic + "/voltage2", String(_powerMeter2Voltage)); MqttSettings.publish(topic + "/powertotal", String(totalPower));
MqttSettings.publish(topic + "/voltage3", String(_powerMeter3Voltage)); MqttSettings.publish(topic + "/voltage1", String(_powerMeter1Voltage));
MqttSettings.publish(topic + "/import", String(_powerMeterImport)); MqttSettings.publish(topic + "/voltage2", String(_powerMeter2Voltage));
MqttSettings.publish(topic + "/export", String(_powerMeterExport)); MqttSettings.publish(topic + "/voltage3", String(_powerMeter3Voltage));
} MqttSettings.publish(topic + "/import", String(_powerMeterImport));
MqttSettings.publish(topic + "/export", String(_powerMeterExport));
} }
void PowerMeterClass::loop() void PowerMeterClass::loop()
@ -169,29 +173,50 @@ void PowerMeterClass::readPowerMeter()
uint8_t _address = config.PowerMeter.SdmAddress; uint8_t _address = config.PowerMeter.SdmAddress;
if (config.PowerMeter.Source == SOURCE_SDM1PH) { if (config.PowerMeter.Source == SOURCE_SDM1PH) {
_powerMeter1Power = static_cast<float>(sdm.readVal(SDM_PHASE_1_POWER, _address)); // this takes a "very long" time as each readVal() is a synchronous
_powerMeter2Power = 0.0; // exchange of serial messages. cache the values and write later.
_powerMeter3Power = 0.0; auto phase1Power = sdm.readVal(SDM_PHASE_1_POWER, _address);
_powerMeter1Voltage = static_cast<float>(sdm.readVal(SDM_PHASE_1_VOLTAGE, _address)); auto phase1Voltage = sdm.readVal(SDM_PHASE_1_VOLTAGE, _address);
_powerMeter2Voltage = 0.0; auto energyImport = sdm.readVal(SDM_IMPORT_ACTIVE_ENERGY, _address);
_powerMeter3Voltage = 0.0; auto energyExport = sdm.readVal(SDM_EXPORT_ACTIVE_ENERGY, _address);
_powerMeterImport = static_cast<float>(sdm.readVal(SDM_IMPORT_ACTIVE_ENERGY, _address));
_powerMeterExport = static_cast<float>(sdm.readVal(SDM_EXPORT_ACTIVE_ENERGY, _address)); std::lock_guard<std::mutex> l(_mutex);
_powerMeter1Power = static_cast<float>(phase1Power);
_powerMeter2Power = 0;
_powerMeter3Power = 0;
_powerMeter1Voltage = static_cast<float>(phase1Voltage);
_powerMeter2Voltage = 0;
_powerMeter3Voltage = 0;
_powerMeterImport = static_cast<float>(energyImport);
_powerMeterExport = static_cast<float>(energyExport);
_lastPowerMeterUpdate = millis(); _lastPowerMeterUpdate = millis();
} }
else if (config.PowerMeter.Source == SOURCE_SDM3PH) { else if (config.PowerMeter.Source == SOURCE_SDM3PH) {
_powerMeter1Power = static_cast<float>(sdm.readVal(SDM_PHASE_1_POWER, _address)); // this takes a "very long" time as each readVal() is a synchronous
_powerMeter2Power = static_cast<float>(sdm.readVal(SDM_PHASE_2_POWER, _address)); // exchange of serial messages. cache the values and write later.
_powerMeter3Power = static_cast<float>(sdm.readVal(SDM_PHASE_3_POWER, _address)); auto phase1Power = sdm.readVal(SDM_PHASE_1_POWER, _address);
_powerMeter1Voltage = static_cast<float>(sdm.readVal(SDM_PHASE_1_VOLTAGE, _address)); auto phase2Power = sdm.readVal(SDM_PHASE_2_POWER, _address);
_powerMeter2Voltage = static_cast<float>(sdm.readVal(SDM_PHASE_2_VOLTAGE, _address)); auto phase3Power = sdm.readVal(SDM_PHASE_3_POWER, _address);
_powerMeter3Voltage = static_cast<float>(sdm.readVal(SDM_PHASE_3_VOLTAGE, _address)); auto phase1Voltage = sdm.readVal(SDM_PHASE_1_VOLTAGE, _address);
_powerMeterImport = static_cast<float>(sdm.readVal(SDM_IMPORT_ACTIVE_ENERGY, _address)); auto phase2Voltage = sdm.readVal(SDM_PHASE_2_VOLTAGE, _address);
_powerMeterExport = static_cast<float>(sdm.readVal(SDM_EXPORT_ACTIVE_ENERGY, _address)); auto phase3Voltage = sdm.readVal(SDM_PHASE_3_VOLTAGE, _address);
auto energyImport = sdm.readVal(SDM_IMPORT_ACTIVE_ENERGY, _address);
auto energyExport = sdm.readVal(SDM_EXPORT_ACTIVE_ENERGY, _address);
std::lock_guard<std::mutex> l(_mutex);
_powerMeter1Power = static_cast<float>(phase1Power);
_powerMeter2Power = static_cast<float>(phase2Power);
_powerMeter3Power = static_cast<float>(phase3Power);
_powerMeter1Voltage = static_cast<float>(phase1Voltage);
_powerMeter2Voltage = static_cast<float>(phase2Voltage);
_powerMeter3Voltage = static_cast<float>(phase3Voltage);
_powerMeterImport = static_cast<float>(energyImport);
_powerMeterExport = static_cast<float>(energyExport);
_lastPowerMeterUpdate = millis(); _lastPowerMeterUpdate = millis();
} }
else if (config.PowerMeter.Source == SOURCE_HTTP) { else if (config.PowerMeter.Source == SOURCE_HTTP) {
if (HttpPowerMeter.updateValues()) { if (HttpPowerMeter.updateValues()) {
std::lock_guard<std::mutex> l(_mutex);
_powerMeter1Power = HttpPowerMeter.getPower(1); _powerMeter1Power = HttpPowerMeter.getPower(1);
_powerMeter2Power = HttpPowerMeter.getPower(2); _powerMeter2Power = HttpPowerMeter.getPower(2);
_powerMeter3Power = HttpPowerMeter.getPower(3); _powerMeter3Power = HttpPowerMeter.getPower(3);