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

SDM power meter: evaluate error code after polling value

Browse Source
This commit is contained in:
Bernhard Kirchen 2024-06-07 09:31:45 +02:00
parent 24f701020c
commit 40423b0e07
2 changed files with 58 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/PowerMeterSerialSdm.h
View File

@ -29,6 +29,7 @@ public:
private: private:
static void pollingLoopHelper(void* context); static void pollingLoopHelper(void* context);
bool readValue(uint16_t reg, float& targetVar);
std::atomic<bool> _taskDone; std::atomic<bool> _taskDone;
void pollingLoop(); void pollingLoop();

68
src/PowerMeterSerialSdm.cpp
View File

@ -96,6 +96,47 @@ void PowerMeterSerialSdm::pollingLoopHelper(void* context)
vTaskDelete(nullptr); vTaskDelete(nullptr);
} }
bool PowerMeterSerialSdm::readValue(uint16_t reg, float& targetVar)
{
float val = _upSdm->readVal(reg, _cfg.Address);
auto err = _upSdm->getErrCode(true/*clear error code*/);
switch (err) {
case SDM_ERR_NO_ERROR:
if (_verboseLogging) {
MessageOutput.printf("[PowerMeterSerialSdm]: read register %d "
"(0x%04x) successfully\r\n", reg, reg);
}
targetVar = val;
return true;
break;
case SDM_ERR_CRC_ERROR:
MessageOutput.printf("[PowerMeterSerialSdm]: CRC error "
"while reading register %d (0x%04x)\r\n", reg, reg);
break;
case SDM_ERR_WRONG_BYTES:
MessageOutput.printf("[PowerMeterSerialSdm]: unexpected data in "
"message while reading register %d (0x%04x)\r\n", reg, reg);
break;
case SDM_ERR_NOT_ENOUGHT_BYTES:
MessageOutput.printf("[PowerMeterSerialSdm]: unexpected end of "
"message while reading register %d (0x%04x)\r\n", reg, reg);
break;
case SDM_ERR_TIMEOUT:
MessageOutput.printf("[PowerMeterSerialSdm]: timeout occured "
"while reading register %d (0x%04x)\r\n", reg, reg);
break;
default:
MessageOutput.printf("[PowerMeterSerialSdm]: unknown SDM error "
"code after reading register %d (0x%04x)\r\n", reg, reg);
break;
}
return false;
}
void PowerMeterSerialSdm::pollingLoop() void PowerMeterSerialSdm::pollingLoop()
{ {
std::unique_lock<std::mutex> lock(_pollingMutex); std::unique_lock<std::mutex> lock(_pollingMutex);
@ -112,27 +153,32 @@ void PowerMeterSerialSdm::pollingLoop()
_lastPoll = millis(); _lastPoll = millis();
uint8_t addr = _cfg.Address;
// reading takes a "very long" time as each readVal() is a synchronous // reading takes a "very long" time as each readVal() is a synchronous
// exchange of serial messages. cache the values and write later to // exchange of serial messages. cache the values and write later to
// enforce consistent values. // enforce consistent values.
float phase1Power = _upSdm->readVal(SDM_PHASE_1_POWER, addr); float phase1Power = 0.0;
float phase2Power = 0.0; float phase2Power = 0.0;
float phase3Power = 0.0; float phase3Power = 0.0;
float phase1Voltage = _upSdm->readVal(SDM_PHASE_1_VOLTAGE, addr); float phase1Voltage = 0.0;
float phase2Voltage = 0.0; float phase2Voltage = 0.0;
float phase3Voltage = 0.0; float phase3Voltage = 0.0;
float energyImport = _upSdm->readVal(SDM_IMPORT_ACTIVE_ENERGY, addr); float energyImport = 0.0;
float energyExport = _upSdm->readVal(SDM_EXPORT_ACTIVE_ENERGY, addr); float energyExport = 0.0;
if (_phases == Phases::Three) { bool success = readValue(SDM_PHASE_1_POWER, phase1Power) &&
phase2Power = _upSdm->readVal(SDM_PHASE_2_POWER, addr); readValue(SDM_PHASE_1_VOLTAGE, phase1Voltage) &&
phase3Power = _upSdm->readVal(SDM_PHASE_3_POWER, addr); readValue(SDM_IMPORT_ACTIVE_ENERGY, energyImport) &&
phase2Voltage = _upSdm->readVal(SDM_PHASE_2_VOLTAGE, addr); readValue(SDM_EXPORT_ACTIVE_ENERGY, energyExport);
phase3Voltage = _upSdm->readVal(SDM_PHASE_3_VOLTAGE, addr);
if (success && _phases == Phases::Three) {
success = readValue(SDM_PHASE_2_POWER, phase2Power) &&
readValue(SDM_PHASE_3_POWER, phase3Power) &&
readValue(SDM_PHASE_2_VOLTAGE, phase2Voltage) &&
readValue(SDM_PHASE_3_VOLTAGE, phase3Voltage);
} }
if (!success) { continue; }
{ {
std::lock_guard<std::mutex> l(_valueMutex); std::lock_guard<std::mutex> l(_valueMutex);
_phase1Power = static_cast<float>(phase1Power); _phase1Power = static_cast<float>(phase1Power);