From adcfdfe2ae268da37db669f0e79052fc9d608f4f Mon Sep 17 00:00:00 2001 From: Nigel Dokter Date: Sun, 22 Jan 2017 16:42:02 +0100 Subject: [PATCH] fixed v2 specification typo; fixed wrongly edited obis reference; --- dsmr_parser/obis_references.py | 2 +- dsmr_parser/telegram_specifications.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dsmr_parser/obis_references.py b/dsmr_parser/obis_references.py index 40475ec..c33f2a5 100644 --- a/dsmr_parser/obis_references.py +++ b/dsmr_parser/obis_references.py @@ -36,7 +36,7 @@ INSTANTANEOUS_ACTIVE_POWER_L3_NEGATIVE = r'\d-\d:62\.7\.0.+?\r\n' EQUIPMENT_IDENTIFIER_GAS = r'\d-\d:96\.1\.0.+?\r\n' # TODO HOURLY_GAS_METER_READING = r'\d-\d:24\.2\.1.+?\r\n' -GAS_METER_READING = r'(\d-\d:24\.3\.0.+?\r\n.+?\r\n)' +GAS_METER_READING = r'\d-\d:24\.3\.0.+?\r\n.+?\r\n' ACTUAL_TRESHOLD_ELECTRICITY = r'\d-\d:17\.0\.0.+?\r\n' ACTUAL_SWITCH_POSITION = r'\d-\d:96\.3\.10.+?\r\n' VALVE_POSITION_GAS = r'\d-\d:24\.4\.0.+?\r\n' diff --git a/dsmr_parser/telegram_specifications.py b/dsmr_parser/telegram_specifications.py index fc6c662..646a2da 100644 --- a/dsmr_parser/telegram_specifications.py +++ b/dsmr_parser/telegram_specifications.py @@ -15,7 +15,7 @@ how the telegram lines are parsed. V2_2 = { 'checksum_support': False, - 'object_signatures': { + 'objects': { obis.EQUIPMENT_IDENTIFIER: CosemParser(ValueParser(str)), obis.ELECTRICITY_USED_TARIFF_1: CosemParser(ValueParser(Decimal)), obis.ELECTRICITY_USED_TARIFF_2: CosemParser(ValueParser(Decimal)),