Skip to content

Add "kvar" unit to reactive power fields #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add "kvar" unit to reactive power fields #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dfe4f5
Add "kvar" unit to reactive power fields
goxlur Feb 6, 2025
3fbd706
Update fields.h
goxlur Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/dsmr/fields.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,26 +465,26 @@ namespace dsmr
DEFINE_FIELD(current_sum, FixedValue, ObisId(1, 0, 90, 7, 0), FixedField, units::A, units::mA);

/*
* LUX and Lithuania
* LUX, Lithuania and Sweden
*/
/* TODO: by IEC 62056 unit's shoudl be kvar, safe to change? */
/* IEC 62056 define the unit of reactive power as kvar. Some meters e.g. L+G E360 uses mixed case kVar */
/* Instantaneous reactive power L1 (+Q) in W resolution */
DEFINE_FIELD(reactive_power_delivered_l1, FixedValue, ObisId(1, 0, 23, 7, 0), FixedField, units::none, units::none);
DEFINE_FIELD(reactive_power_delivered_l1, FixedValue, ObisId(1, 0, 23, 7, 0), FixedField, units::kvar, units::kvar);
/* Instantaneous reactive power L2 (+Q) in W resolution */
DEFINE_FIELD(reactive_power_delivered_l2, FixedValue, ObisId(1, 0, 43, 7, 0), FixedField, units::none, units::none);
DEFINE_FIELD(reactive_power_delivered_l2, FixedValue, ObisId(1, 0, 43, 7, 0), FixedField, units::kvar, units::kvar);
/* Instantaneous reactive power L3 (+Q) in W resolution */
DEFINE_FIELD(reactive_power_delivered_l3, FixedValue, ObisId(1, 0, 63, 7, 0), FixedField, units::none, units::none);
DEFINE_FIELD(reactive_power_delivered_l3, FixedValue, ObisId(1, 0, 63, 7, 0), FixedField, units::kvar, units::kvar);

/*
* LUX and Lithuania
* LUX, Lithuania and Sweden
*/
/* TODO: by IEC 62056 unit's shoudl be kvar, safe to change? */
/* IEC 62056 define the unit of reactive power as kvar. Some meters e.g. L+G E360 uses mixed case kVar */
/* Instantaneous reactive power L1 (-Q) in W resolution */
DEFINE_FIELD(reactive_power_returned_l1, FixedValue, ObisId(1, 0, 24, 7, 0), FixedField, units::none, units::none);
DEFINE_FIELD(reactive_power_returned_l1, FixedValue, ObisId(1, 0, 24, 7, 0), FixedField, units::kvar, units::kvar);
/* Instantaneous reactive power L2 (-Q) in W resolution */
DEFINE_FIELD(reactive_power_returned_l2, FixedValue, ObisId(1, 0, 44, 7, 0), FixedField, units::none, units::none);
DEFINE_FIELD(reactive_power_returned_l2, FixedValue, ObisId(1, 0, 44, 7, 0), FixedField, units::kvar, units::kvar);
/* Instantaneous reactive power L3 (-Q) in W resolution */
DEFINE_FIELD(reactive_power_returned_l3, FixedValue, ObisId(1, 0, 64, 7, 0), FixedField, units::none, units::none);
DEFINE_FIELD(reactive_power_returned_l3, FixedValue, ObisId(1, 0, 64, 7, 0), FixedField, units::kvar, units::kvar);

/* Apparent instantaneous power (+S) in kVA resolution */
DEFINE_FIELD(apparent_delivery_power, FixedValue, ObisId(1, 0, 9, 7, 0), FixedField, units::kVA, units::VA);
Expand Down