An error occurred while retrieving approval data for this merge request.
1 unresolved thread
ds-metering advertizes energy as Wh, but actually returns Ws which is the raw value stored in rrd
Activity
223 for (const auto& meter : m_apartment.getDSMeters()) { 224 if (!meter->isPresent() || !meter->getCapability_HasMetering()) { 225 continue; 226 } 220 break; 221 case dsModel::MeteringType::energyMetering: 227 222 if (auto energy = energyMetering.getLastReading(meteringDecoded.origin, 228 223 meteringDecoded.meteringType)) { 229 224 value += energy->energy; 230 225 lastChanged = ds::max(lastChanged, energy->lastChanged); 231 226 } 232 } 233 break; 234 case dsModel::MeteringType::powerProducedMetering: 235 for (const auto& meter : m_apartment.getDSMeters()) { 236 if (!meter->isPresent() || !meter->getCapability_HasMeteringProducerEnabled()) { added 16 commits
-
c0e9fb2d...c1331ae8 - 9 commits from branch
master
- 2df805c8 - metering: add getLastReading supporting dsModel::ControllerMeteringOrigin as key
- b34df848 - metering: replace bool by EnergyUnit enum
- 98e448f4 - metering-test: prepare extending getLastReading by ApartmentOrigin
- 2e9c2e53 - metering-test: factor out addConsumption/addProduction helper function
- ae56378a - trompeloeil: import any_of from cookbook
- c0c6f717 - metering-test: factor out createController
- 1bdb2f6c - getLatestReading(ApartmentOrigin)
Toggle commit list-
c0e9fb2d...c1331ae8 - 9 commits from branch
mentioned in commit 25fafdca