From 3f41a73b9d98bb1d97e003ab66737f0c9b2b13e8 Mon Sep 17 00:00:00 2001 From: gigatexel <65073191+gigatexel@users.noreply.github.com> Date: Wed, 6 Apr 2022 13:28:57 +0200 Subject: [PATCH 1/5] Update obis_references.py --- dsmr_parser/obis_references.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dsmr_parser/obis_references.py b/dsmr_parser/obis_references.py index d4a4cbf..b52d1e6 100644 --- a/dsmr_parser/obis_references.py +++ b/dsmr_parser/obis_references.py @@ -65,7 +65,9 @@ ELECTRICITY_IMPORTED_TOTAL = r'\d-\d:1\.8\.0.+?\r\n' # Total imported energy re ELECTRICITY_EXPORTED_TOTAL = r'\d-\d:2\.8\.0.+?\r\n' # Total exported energy register (P-) # International non generalized additions (country specific) / risk for necessary refactoring -BELGIUM_HOURLY_GAS_METER_READING = r'\d-\d:24\.2\.3.+?\r\n' # Different code, same format. +BELGIUM_5MIN_GAS_METER_READING = r'\d-\d:24\.2\.3.+?\r\n' # Different code, same format. +BELGIUM_MAX_POWER_PER_PHASE = r'\d-\d:17\.0\.0.+?\r\n' # Applicable when power limitation is active +BELGIUM_MAX_CURRENT_PER_PHASE = r'\d-\d:31\.4\.0.+?\r\n' # Applicable when current limitation is active LUXEMBOURG_EQUIPMENT_IDENTIFIER = r'\d-\d:42\.0\.0.+?\r\n' # Logical device name Q3D_EQUIPMENT_IDENTIFIER = r'\d-\d:0\.0\.0.+?\r\n' # Logical device name Q3D_EQUIPMENT_STATE = r'\d-\d:96\.5\.5.+?\r\n' # Device state (hexadecimal) From 527730781c5b6cfac42b5b644fba3f6d3254c5ed Mon Sep 17 00:00:00 2001 From: gigatexel <65073191+gigatexel@users.noreply.github.com> Date: Wed, 6 Apr 2022 13:30:12 +0200 Subject: [PATCH 2/5] Update obis_name_mapping.py --- dsmr_parser/obis_name_mapping.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dsmr_parser/obis_name_mapping.py b/dsmr_parser/obis_name_mapping.py index b224b7a..7490b06 100644 --- a/dsmr_parser/obis_name_mapping.py +++ b/dsmr_parser/obis_name_mapping.py @@ -50,7 +50,9 @@ EN = { obis.ACTUAL_TRESHOLD_ELECTRICITY: 'ACTUAL_TRESHOLD_ELECTRICITY', obis.ACTUAL_SWITCH_POSITION: 'ACTUAL_SWITCH_POSITION', obis.VALVE_POSITION_GAS: 'VALVE_POSITION_GAS', - obis.BELGIUM_HOURLY_GAS_METER_READING: 'BELGIUM_HOURLY_GAS_METER_READING', + obis.BELGIUM_5MIN_GAS_METER_READING: 'BELGIUM_5MIN_GAS_METER_READING', + obis.BELGIUM_MAX_POWER_PER_PHASE: 'BELGIUM_MAX_POWER_PER_PHASE', + obis.BELGIUM_MAX_CURRENT_PER_PHASE : 'BELGIUM_MAX_CURRENT_PER_PHASE', obis.LUXEMBOURG_EQUIPMENT_IDENTIFIER: 'LUXEMBOURG_EQUIPMENT_IDENTIFIER', obis.Q3D_EQUIPMENT_IDENTIFIER: 'Q3D_EQUIPMENT_IDENTIFIER', obis.Q3D_EQUIPMENT_STATE: 'Q3D_EQUIPMENT_STATE', From 15b3653a0270cdb7307161e5000f9b4d88420e7f Mon Sep 17 00:00:00 2001 From: gigatexel <65073191+gigatexel@users.noreply.github.com> Date: Wed, 6 Apr 2022 13:30:58 +0200 Subject: [PATCH 3/5] Update telegram_specifications.py --- dsmr_parser/telegram_specifications.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dsmr_parser/telegram_specifications.py b/dsmr_parser/telegram_specifications.py index c8f05a5..f14cef2 100644 --- a/dsmr_parser/telegram_specifications.py +++ b/dsmr_parser/telegram_specifications.py @@ -144,10 +144,18 @@ ALL = (V2_2, V3, V4, V5) BELGIUM_FLUVIUS = deepcopy(V5) BELGIUM_FLUVIUS['objects'].update({ - obis.BELGIUM_HOURLY_GAS_METER_READING: MBusParser( + obis.BELGIUM_5MIN_GAS_METER_READING: MBusParser( ValueParser(timestamp), ValueParser(Decimal) - ) + ), + obis.BELGIUM_MAX_POWER_PER_PHASE: MBusParser( + ValueParser(timestamp), + ValueParser(Decimal) + ), + obis.BELGIUM_MAX_CURRENT_PER_PHASE: MBusParser( + ValueParser(timestamp), + ValueParser(Decimal) + ), }) LUXEMBOURG_SMARTY = deepcopy(V5) From 99ab86fffb2e7e2d785b29bf92c7065b0ddf995f Mon Sep 17 00:00:00 2001 From: gigatexel <65073191+gigatexel@users.noreply.github.com> Date: Fri, 8 Apr 2022 09:56:36 +0200 Subject: [PATCH 4/5] Update telegram_specifications.py --- dsmr_parser/telegram_specifications.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsmr_parser/telegram_specifications.py b/dsmr_parser/telegram_specifications.py index f14cef2..07f60cb 100644 --- a/dsmr_parser/telegram_specifications.py +++ b/dsmr_parser/telegram_specifications.py @@ -155,7 +155,7 @@ BELGIUM_FLUVIUS['objects'].update({ obis.BELGIUM_MAX_CURRENT_PER_PHASE: MBusParser( ValueParser(timestamp), ValueParser(Decimal) - ), + ), }) LUXEMBOURG_SMARTY = deepcopy(V5) From 3d5599289ebe9d3f7f0fcc693c12e721c1b510c0 Mon Sep 17 00:00:00 2001 From: gigatexel <65073191+gigatexel@users.noreply.github.com> Date: Fri, 8 Apr 2022 09:57:02 +0200 Subject: [PATCH 5/5] Update obis_name_mapping.py --- dsmr_parser/obis_name_mapping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsmr_parser/obis_name_mapping.py b/dsmr_parser/obis_name_mapping.py index 7490b06..d5a6d92 100644 --- a/dsmr_parser/obis_name_mapping.py +++ b/dsmr_parser/obis_name_mapping.py @@ -52,7 +52,7 @@ EN = { obis.VALVE_POSITION_GAS: 'VALVE_POSITION_GAS', obis.BELGIUM_5MIN_GAS_METER_READING: 'BELGIUM_5MIN_GAS_METER_READING', obis.BELGIUM_MAX_POWER_PER_PHASE: 'BELGIUM_MAX_POWER_PER_PHASE', - obis.BELGIUM_MAX_CURRENT_PER_PHASE : 'BELGIUM_MAX_CURRENT_PER_PHASE', + obis.BELGIUM_MAX_CURRENT_PER_PHASE: 'BELGIUM_MAX_CURRENT_PER_PHASE', obis.LUXEMBOURG_EQUIPMENT_IDENTIFIER: 'LUXEMBOURG_EQUIPMENT_IDENTIFIER', obis.Q3D_EQUIPMENT_IDENTIFIER: 'Q3D_EQUIPMENT_IDENTIFIER', obis.Q3D_EQUIPMENT_STATE: 'Q3D_EQUIPMENT_STATE',