Skip to content
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.

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

Add Belgian Gas Meter Obis code (non-temperature converted metering) #28

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/dsmr/fields.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,10 @@ constexpr ObisId gas_delivered::id;
constexpr char gas_delivered::name_progmem[];
constexpr const __FlashStringHelper *gas_delivered::name;

constexpr ObisId gas_delivered_non_temp_converted::id;
constexpr char gas_delivered_non_temp_converted::name_progmem[];
constexpr const __FlashStringHelper *gas_delivered_non_temp_converted::name;

constexpr ObisId thermal_device_type::id;
constexpr char thermal_device_type::name_progmem[];
constexpr const __FlashStringHelper *thermal_device_type::name;
Expand Down
5 changes: 5 additions & 0 deletions src/dsmr/fields.h
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,11 @@ DEFINE_FIELD(gas_valve_position, uint8_t, ObisId(0, GAS_MBUS_ID, 24, 4, 0), IntF
* "hourly value") */
DEFINE_FIELD(gas_delivered, TimestampedFixedValue, ObisId(0, GAS_MBUS_ID, 24, 2, 1), TimestampedFixedField, units::m3, units::dm3);

/* Last 5-minute value (non-temperature converted), gas delivered to client
* in m3, including decimal values and capture time
*/
DEFINE_FIELD(gas_delivered_non_temp_converted, TimestampedFixedValue, ObisId(0, GAS_MBUS_ID, 24, 2, 3), TimestampedFixedField, units::m3, units::dm3);


/* Device-Type */
DEFINE_FIELD(thermal_device_type, uint16_t, ObisId(0, THERMAL_MBUS_ID, 24, 1, 0), IntField, units::none);
Expand Down