Preparing release 0.29

.github/workflows/tests.yml

@@ -1,45 +0,0 @@
-name: Tests
-
-on:
-  push: ~
-  pull_request: ~
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10  # Don't run forever when stale
-
-    strategy:
-      matrix:
-        python-version:
-          - 3.6
-          - 3.7
-          - 3.8
-          - 3.9
-
-    name: Python ${{ matrix.python-version }}
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Cached PIP dependencies
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cache/pip
-            ~/.tox/python/.pytest_cache
-          key: pip-${{ matrix.python-version }}-${{ hashFiles('setup.py', 'tox.ini') }}
-          restore-keys: pip-${{ matrix.python-version }}-
-
-      - name: Install dependencies
-        run: pip install tox
-
-      - name: Run tests
-        run: tox
-
-      - name: Code coverage upload
-        uses: codecov/codecov-action@v1

.travis.yml

@@ -0,0 +1,18 @@
+language: python
+
+python:
+  - 2.7
+  - 3.5
+  - 3.6
+  - 3.8
+  
+install: pip install tox-travis codecov
+
+script: tox
+
+after_success:
+  - codecov
+
+matrix:
+  allow_failures:
+    - python: 2.7

CHANGELOG.rst

@@ -1,15 +1,9 @@
 Change Log
 ----------
 
-**0.31** (2021-11-21)
-- Support for (German) EasyMeter Q3D using COM-1 Ethernet Gateway (`pull request #92 <https://github.com/ndokter/dsmr_parser/pull/92>`_).
-
-**0.30** (2021-08-18)
-- Add support for Swedish smart meters (`pull request #86 <https://github.com/ndokter/dsmr_parser/pull/86>`_).
-
 **0.29** (2021-04-18)
 - Add value and unit properties to ProfileGenericObject to make sure that code like iterators that rely on that do not break (`pull request #71 <https://github.com/ndokter/dsmr_parser/pull/71>`_).
-Remove deprecated asyncio coroutine decorator (`pull request #76 <https://github.com/ndokter/dsmr_parser/pull/76>`_).
+- Remove deprecated asyncio coroutine decorator (`pull request #76 <https://github.com/ndokter/dsmr_parser/pull/76>`_).
 
 **0.28** (2021-02-21)
 - Optional keep alive monitoring for TCP/IP connections (`pull request #73 <https://github.com/ndokter/dsmr_parser/pull/73>`_).

README.rst

@@ -1,6 +1,3 @@
-**Notice:** this repository is in need of a new maintainer. If you are interested or have ideas about this, please let me know.
-
-
 DSMR Parser
 ===========
 

dsmr_parser/__main__.py

@@ -16,8 +16,8 @@ def console():
                         help='alternatively connect using TCP host.')
     parser.add_argument('--port', default=None,
                         help='TCP port to use for connection')
-    parser.add_argument('--version', default='2.2', choices=['2.2', '4', '5', '5B', '5L', '5S', 'Q3D'],
-                        help='DSMR version (2.2, 4, 5, 5B, 5L, 5S, Q3D)')
+    parser.add_argument('--version', default='2.2', choices=['2.2', '4', '5', '5B', '5L'],
+                        help='DSMR version (2.2, 4, 5, 5B, 5L)')
     parser.add_argument('--verbose', '-v', action='count')
 
     args = parser.parse_args()

dsmr_parser/clients/protocol.py

@@ -23,9 +23,6 @@ def create_dsmr_protocol(dsmr_version, telegram_callback, loop=None, **kwargs):
     elif dsmr_version == '4':
         specification = telegram_specifications.V4
         serial_settings = SERIAL_SETTINGS_V4
-    elif dsmr_version == '4+':
-        specification = telegram_specifications.V5
-        serial_settings = SERIAL_SETTINGS_V4
     elif dsmr_version == '5':
         specification = telegram_specifications.V5
         serial_settings = SERIAL_SETTINGS_V5
@@ -35,12 +32,6 @@ def create_dsmr_protocol(dsmr_version, telegram_callback, loop=None, **kwargs):
     elif dsmr_version == "5L":
         specification = telegram_specifications.LUXEMBOURG_SMARTY
         serial_settings = SERIAL_SETTINGS_V5
-    elif dsmr_version == "5S":
-        specification = telegram_specifications.SWEDEN
-        serial_settings = SERIAL_SETTINGS_V5
-    elif dsmr_version == "Q3D":
-        specification = telegram_specifications.Q3D
-        serial_settings = SERIAL_SETTINGS_V5
     else:
         raise NotImplementedError("No telegram parser found for version: %s",
                                   dsmr_version)
@@ -105,16 +96,12 @@ class DSMRProtocol(asyncio.Protocol):
 
     def data_received(self, data):
         """Add incoming data to buffer."""
-
-        # accept latin-1 (8-bit) on the line, to allow for non-ascii transport or padding
-        data = data.decode("latin1")
+        data = data.decode('ascii')
         self._active = True
         self.log.debug('received data: %s', data)
         self.telegram_buffer.append(data)
 
         for telegram in self.telegram_buffer.get_all():
-            # ensure actual telegram is ascii (7-bit) only (IEC 646 required in section 5.4 of IEC 62056-21)
-            telegram = telegram.encode("latin1").decode("ascii")
             self.handle_telegram(telegram)
 
     def keep_alive(self):

dsmr_parser/clients/serial_.py

@@ -1,3 +1,4 @@
+import asyncio
 import logging
 import serial
 import serial_asyncio

dsmr_parser/obis_name_mapping.py

@@ -13,7 +13,6 @@ EN = {
     obis.ELECTRICITY_IMPORTED_TOTAL: 'ELECTRICITY_IMPORTED_TOTAL',
     obis.ELECTRICITY_USED_TARIFF_1: 'ELECTRICITY_USED_TARIFF_1',
     obis.ELECTRICITY_USED_TARIFF_2: 'ELECTRICITY_USED_TARIFF_2',
-    obis.ELECTRICITY_EXPORTED_TOTAL: 'ELECTRICITY_EXPORTED_TOTAL',
     obis.ELECTRICITY_DELIVERED_TARIFF_1: 'ELECTRICITY_DELIVERED_TARIFF_1',
     obis.ELECTRICITY_DELIVERED_TARIFF_2: 'ELECTRICITY_DELIVERED_TARIFF_2',
     obis.ELECTRICITY_ACTIVE_TARIFF: 'ELECTRICITY_ACTIVE_TARIFF',
@@ -53,12 +52,7 @@ EN = {
     obis.BELGIUM_HOURLY_GAS_METER_READING: 'BELGIUM_HOURLY_GAS_METER_READING',
     obis.LUXEMBOURG_EQUIPMENT_IDENTIFIER: 'LUXEMBOURG_EQUIPMENT_IDENTIFIER',
     obis.LUXEMBOURG_ELECTRICITY_USED_TARIFF_GLOBAL: 'LUXEMBOURG_ELECTRICITY_USED_TARIFF_GLOBAL',
-    obis.LUXEMBOURG_ELECTRICITY_DELIVERED_TARIFF_GLOBAL: 'LUXEMBOURG_ELECTRICITY_DELIVERED_TARIFF_GLOBAL',
-    obis.SWEDEN_ELECTRICITY_USED_TARIFF_GLOBAL: 'SWEDEN_ELECTRICITY_USED_TARIFF_GLOBAL',
-    obis.SWEDEN_ELECTRICITY_DELIVERED_TARIFF_GLOBAL: 'SWEDEN_ELECTRICITY_DELIVERED_TARIFF_GLOBAL',
-    obis.Q3D_EQUIPMENT_IDENTIFIER: 'Q3D_EQUIPMENT_IDENTIFIER',
-    obis.Q3D_EQUIPMENT_STATE: 'Q3D_EQUIPMENT_STATE',
-    obis.Q3D_EQUIPMENT_SERIALNUMBER: 'Q3D_EQUIPMENT_SERIALNUMBER',
+    obis.LUXEMBOURG_ELECTRICITY_DELIVERED_TARIFF_GLOBAL: 'LUXEMBOURG_ELECTRICITY_DELIVERED_TARIFF_GLOBAL'
 }
 
 REVERSE_EN = dict([(v, k) for k, v in EN.items()])

dsmr_parser/obis_references.py

@@ -11,7 +11,6 @@ P1_MESSAGE_TIMESTAMP = r'\d-\d:1\.0\.0.+?\r\n'
 ELECTRICITY_IMPORTED_TOTAL = r'\d-\d:1\.8\.0.+?\r\n'
 ELECTRICITY_USED_TARIFF_1 = r'\d-\d:1\.8\.1.+?\r\n'
 ELECTRICITY_USED_TARIFF_2 = r'\d-\d:1\.8\.2.+?\r\n'
-ELECTRICITY_EXPORTED_TOTAL = r'\d-\d:2\.8\.0.+?\r\n'
 ELECTRICITY_DELIVERED_TARIFF_1 = r'\d-\d:2\.8\.1.+?\r\n'
 ELECTRICITY_DELIVERED_TARIFF_2 = r'\d-\d:2\.8\.2.+?\r\n'
 ELECTRICITY_ACTIVE_TARIFF = r'\d-\d:96\.14\.0.+?\r\n'
@@ -67,8 +66,3 @@ BELGIUM_HOURLY_GAS_METER_READING = r'\d-\d:24\.2\.3.+?\r\n'  # Different code, s
 LUXEMBOURG_EQUIPMENT_IDENTIFIER = r'\d-\d:42\.0\.0.+?\r\n'  # Logical device name
 LUXEMBOURG_ELECTRICITY_USED_TARIFF_GLOBAL = r'\d-\d:1\.8\.0.+?\r\n'  # Total imported energy register (P+)
 LUXEMBOURG_ELECTRICITY_DELIVERED_TARIFF_GLOBAL = r'\d-\d:2\.8\.0.+?\r\n'  # Total exported energy register (P-)
-SWEDEN_ELECTRICITY_USED_TARIFF_GLOBAL = r'\d-\d:1\.8\.0.+?\r\n'  # Total imported energy register (P+)
-SWEDEN_ELECTRICITY_DELIVERED_TARIFF_GLOBAL = r'\d-\d:2\.8\.0.+?\r\n'  # Total exported energy register (P-)
-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)
-Q3D_EQUIPMENT_SERIALNUMBER = r'\d-\d:96\.1\.255.+?\r\n'  # Device Serialnumber

dsmr_parser/telegram_specifications.py

@@ -156,44 +156,3 @@ LUXEMBOURG_SMARTY['objects'].update({
     obis.LUXEMBOURG_ELECTRICITY_USED_TARIFF_GLOBAL: CosemParser(ValueParser(Decimal)),
     obis.LUXEMBOURG_ELECTRICITY_DELIVERED_TARIFF_GLOBAL: CosemParser(ValueParser(Decimal)),
 })
-
-# Source: https://www.energiforetagen.se/globalassets/energiforetagen/det-erbjuder-vi/kurser-och-konferenser/elnat/
-#         branschrekommendation-lokalt-granssnitt-v2_0-201912.pdf
-SWEDEN = {
-    'checksum_support': True,
-    'objects': {
-        obis.P1_MESSAGE_HEADER: CosemParser(ValueParser(str)),
-        obis.P1_MESSAGE_TIMESTAMP: CosemParser(ValueParser(timestamp)),
-        obis.SWEDEN_ELECTRICITY_USED_TARIFF_GLOBAL: CosemParser(ValueParser(Decimal)),
-        obis.SWEDEN_ELECTRICITY_DELIVERED_TARIFF_GLOBAL: CosemParser(ValueParser(Decimal)),
-        obis.CURRENT_ELECTRICITY_USAGE: CosemParser(ValueParser(Decimal)),
-        obis.CURRENT_ELECTRICITY_DELIVERY: CosemParser(ValueParser(Decimal)),
-        obis.INSTANTANEOUS_ACTIVE_POWER_L1_POSITIVE: CosemParser(ValueParser(Decimal)),
-        obis.INSTANTANEOUS_ACTIVE_POWER_L2_POSITIVE: CosemParser(ValueParser(Decimal)),
-        obis.INSTANTANEOUS_ACTIVE_POWER_L3_POSITIVE: CosemParser(ValueParser(Decimal)),
-        obis.INSTANTANEOUS_ACTIVE_POWER_L1_NEGATIVE: CosemParser(ValueParser(Decimal)),
-        obis.INSTANTANEOUS_ACTIVE_POWER_L2_NEGATIVE: CosemParser(ValueParser(Decimal)),
-        obis.INSTANTANEOUS_ACTIVE_POWER_L3_NEGATIVE: CosemParser(ValueParser(Decimal)),
-        obis.INSTANTANEOUS_VOLTAGE_L1: CosemParser(ValueParser(Decimal)),
-        obis.INSTANTANEOUS_VOLTAGE_L2: CosemParser(ValueParser(Decimal)),
-        obis.INSTANTANEOUS_VOLTAGE_L3: CosemParser(ValueParser(Decimal)),
-        obis.INSTANTANEOUS_CURRENT_L1: CosemParser(ValueParser(Decimal)),
-        obis.INSTANTANEOUS_CURRENT_L2: CosemParser(ValueParser(Decimal)),
-        obis.INSTANTANEOUS_CURRENT_L3: CosemParser(ValueParser(Decimal)),
-    }
-}
-
-Q3D = {
-    "checksum_support": False,
-    "objects": {
-        obis.Q3D_EQUIPMENT_IDENTIFIER: CosemParser(ValueParser(str)),
-        obis.ELECTRICITY_IMPORTED_TOTAL: CosemParser(ValueParser(Decimal)),
-        obis.ELECTRICITY_EXPORTED_TOTAL: CosemParser(ValueParser(Decimal)),
-        obis.INSTANTANEOUS_ACTIVE_POWER_L1_POSITIVE: CosemParser(ValueParser(Decimal)),
-        obis.INSTANTANEOUS_ACTIVE_POWER_L2_POSITIVE: CosemParser(ValueParser(Decimal)),
-        obis.INSTANTANEOUS_ACTIVE_POWER_L3_POSITIVE: CosemParser(ValueParser(Decimal)),
-        obis.CURRENT_ELECTRICITY_USAGE: CosemParser(ValueParser(Decimal)),
-        obis.Q3D_EQUIPMENT_STATE: CosemParser(ValueParser(str)),
-        obis.Q3D_EQUIPMENT_SERIALNUMBER: CosemParser(ValueParser(str)),
-    },
-}

setup.py

@@ -5,9 +5,8 @@ setup(
     description='Library to parse Dutch Smart Meter Requirements (DSMR)',
     author='Nigel Dokter and many others',
     author_email='nigel@nldr.net',
-    license='MIT',
     url='https://github.com/ndokter/dsmr_parser',
-    version='0.31',
+    version='0.29',
     packages=find_packages(exclude=('test', 'test.*')),
     install_requires=[
         'pyserial>=3,<4',

test/example_telegrams.py

@@ -128,43 +128,3 @@ TELEGRAM_V5 = (
     '0-2:96.1.0()\r\n'
     '!6EEE\r\n'
 )
-
-# EasyMeter via COM-1 Ethernet Gateway
-# Q3D Manual (german) https://www.easymeter.com/downloads/products/zaehler/Q3D/Easymeter_Q3D_DE_2016-06-15.pdf
-#  - type code on page 8
-#  - D0-Specs on page 20
-#
-# last two lines are added by the COM-1 Ethernet Gateway
-
-TELEGRAM_ESY5Q3DB1024_V304 = ( # Easymeter an Hauptstromzähler
-    '/ESY5Q3DB1024 V3.04\r\n'
-    '\r\n'
-    '1-0:0.0.0*255(0272031312565)\r\n'
-    '1-0:1.8.0*255(00052185.7825309*kWh)\r\n'
-    '1-0:2.8.0*255(00019949.3221493*kWh)\r\n'
-    '1-0:21.7.0*255(000747.85*W)\r\n'
-    '1-0:41.7.0*255(000737.28*W)\r\n'
-    '1-0:61.7.0*255(000639.73*W)\r\n'
-    '1-0:1.7.0*255(002124.86*W)\r\n'
-    '1-0:96.5.5*255(80)\r\n'
-    '0-0:96.1.255*255(1ESY1313002565)\r\n'
-    '!\r\n'
-    '  25803103\r\n'
-    '\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\r\n'
-)
-
-TELEGRAM_ESY5Q3DA1004_V304 = ( # Easymeter an Wärmepumpe
-    '/ESY5Q3DA1004 V3.04\r\n'
-    '\r\n'
-    '1-0:0.0.0*255(1336001560)\r\n'
-    '1-0:1.8.0*255(00032549.5061662*kWh)\r\n'
-    '1-0:21.7.0*255(000557.29*W)\r\n'
-    '1-0:41.7.0*255(000521.62*W)\r\n'
-    '1-0:61.7.0*255(000609.30*W)\r\n'
-    '1-0:1.7.0*255(001688.21*W)\r\n'
-    '1-0:96.5.5*255(80)\r\n'
-    '0-0:96.1.255*255(1ESY1336001560)\r\n'
-    '!\r\n'
-    '  25818685\r\n'
-    'DE0000000000000000000000000000003\r\n'
-)

test/test_protocol.py

@@ -3,6 +3,8 @@ from unittest.mock import Mock
 import unittest
 
 from dsmr_parser import obis_references as obis
+from dsmr_parser import telegram_specifications
+from dsmr_parser.parsers import TelegramParser
 from dsmr_parser.clients.protocol import create_dsmr_protocol
 
 

tox.ini

@@ -1,9 +1,13 @@
+[tox]
+envlist = py35,py36,py37,py38,py39
+
 [testenv]
 deps=
   pytest
   pytest-cov
   pylama
   pytest-asyncio
+  pytest-catchlog
   pytest-mock
 commands=
   py.test --cov=dsmr_parser test {posargs}