diff --git a/amshan/kamstrup.py b/amshan/kamstrup.py index 944d9f2..ced5c21 100644 --- a/amshan/kamstrup.py +++ b/amshan/kamstrup.py @@ -36,15 +36,23 @@ LlcPdu: construct.Struct = cosem.get_llc_pdu_struct(NotificationBody) _field_scaling_standard = { - "1.1.31.7.0.255": -2, - "1.1.51.7.0.255": -2, - "1.1.71.7.0.255": -2, + "1.1.31.7.0.255": -2, # IL1 + "1.1.51.7.0.255": -2, # IL2 + "1.1.71.7.0.255": -2, # IL3 + "1.1.1.8.0.255": 1, # A14 + "1.1.2.8.0.255": 1, # A23 + "1.1.3.8.0.255": 1, # R12 + "1.1.4.8.0.255": 1, # R34 } _field_scaling_ct_meter = { - "1.1.31.7.0.255": -3, - "1.1.51.7.0.255": -3, - "1.1.71.7.0.255": -3, + "1.1.31.7.0.255": -3, # IL1 + "1.1.51.7.0.255": -3, # IL2 + "1.1.71.7.0.255": -3, # IL3 + "1.1.1.8.0.255": 1, # A14 + "1.1.2.8.0.255": 1, # A23 + "1.1.3.8.0.255": 1, # R12 + "1.1.4.8.0.255": 1, # R34 } diff --git a/setup.py b/setup.py index 82138f5..8a720f0 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setuptools.setup( name="amshan", - version="1.0.1", + version="1.0.2", author="Tore Amundsen", author_email="tore@amundsen.org", description="Decode MBUS (Meter Bus) data with special support for norwegian AMS-smart meters (HAN port)",