Preparing for release 0.24

Merge pull request #62 from RobBie1221/add_lux_eq
Add Luxembourg equipment identifier
2020-11-27 21:18:59 +01:00 · 2020-11-12 17:10:54 +01:00 · 2020-11-07 08:56:24 +01:00 · 2020-11-04 20:42:38 +01:00 · 2020-11-03 21:29:35 +01:00 · 2020-11-03 21:27:21 +01:00
10 changed files with 48 additions and 23 deletions
@@ -2,9 +2,9 @@ language: python

 python:
  - 2.7
-  - 3.4
  - 3.5
  - 3.6
+  - 3.8
  
 install: pip install tox-travis codecov

@@ -1,5 +1,19 @@
 Change Log
 ----------
+
+**0.24** (2020-11-27)
+- Add Luxembourg equipment identifier (`pull request #62 <https://github.com/ndokter/dsmr_parser/pull/62>`_).
+
+**0.23** (2020-11-07)
+- Resolved issue with x-x:24.3.0 where it contains non-integer character (`pull request #61 <https://github.com/ndokter/dsmr_parser/pull/61>`_).
+- Tests are not installed anymore (`pull request #59 <https://github.com/ndokter/dsmr_parser/pull/59>`_).
+- Example telegram improvement (`pull request #58 <https://github.com/ndokter/dsmr_parser/pull/58>`_).
+
+**0.22** (2020-08-23)
+
+- CRC check speed is improved
+- Exception info improvement
+
 **0.21** (2020-05-25)

 - All objects can produce a json serialization of their state.
@@ -56,7 +56,7 @@ into a dictionary.

     # String is formatted in separate lines for readability.
     telegram_str = (
-         '/ISk5\2MT382-1000\r\n'
+         '/ISk5\\2MT382-1000\r\n'
         '\r\n'
         '0-0:96.1.1(4B384547303034303436333935353037)\r\n'
         '1-0:1.8.1(12345.678*kWh)\r\n'
@@ -29,6 +29,9 @@ def create_dsmr_protocol(dsmr_version, telegram_callback, loop=None):
    elif dsmr_version == '5B':
        specification = telegram_specifications.BELGIUM_FLUVIUS
        serial_settings = SERIAL_SETTINGS_V5
+    elif dsmr_version == "5L":
+        specification = telegram_specifications.LUXEMBOURG_SMARTY
+        serial_settings = SERIAL_SETTINGS_V5
    else:
        raise NotImplementedError("No telegram parser found for version: %s",
                                  dsmr_version)
@@ -95,7 +98,7 @@ class DSMRProtocol(asyncio.Protocol):
    def connection_lost(self, exc):
        """Stop when connection is lost."""
        if exc:
-            self.log.exception('disconnected due to exception')
+            self.log.exception('disconnected due to exception', exc_info=exc)
        else:
            self.log.info('disconnected because of close/abort.')
        self._closed.set()
@@ -63,5 +63,6 @@ ELECTRICITY_DELIVERED_TARIFF_ALL = (

 # Alternate codes for foreign countries.
 BELGIUM_HOURLY_GAS_METER_READING = r'\d-\d:24\.2\.3.+?\r\n'  # Different code, same format.
+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-)
@@ -11,6 +11,8 @@ logger = logging.getLogger(__name__)

 class TelegramParser(object):

+    crc16_tab = []
+
    def __init__(self, telegram_specification, apply_checksum_validation=True):
        """
        :param telegram_specification: determines how the telegram is parsed
@@ -93,24 +95,28 @@ class TelegramParser(object):

    @staticmethod
    def crc16(telegram):
-        crc16_tab = []
-
-        for i in range(0, 256):
-            crc = c_ushort(i).value
-            for j in range(0, 8):
-                if (crc & 0x0001):
-                    crc = c_ushort(crc >> 1).value ^ 0xA001
-                else:
-                    crc = c_ushort(crc >> 1).value
-            crc16_tab.append(hex(crc))
+        """
+        Calculate the CRC16 value for the given telegram

+        :param str telegram:
+        """
        crcValue = 0x0000

+        if len(TelegramParser.crc16_tab) == 0:
+            for i in range(0, 256):
+                crc = c_ushort(i).value
+                for j in range(0, 8):
+                    if (crc & 0x0001):
+                        crc = c_ushort(crc >> 1).value ^ 0xA001
+                    else:
+                        crc = c_ushort(crc >> 1).value
+                TelegramParser.crc16_tab.append(hex(crc))
+
        for c in telegram:
            d = ord(c)
            tmp = crcValue ^ d
            rotated = c_ushort(crcValue >> 8).value
-            crcValue = rotated ^ int(crc16_tab[(tmp & 0x00ff)], 0)
+            crcValue = rotated ^ int(TelegramParser.crc16_tab[(tmp & 0x00ff)], 0)

        return crcValue

@@ -34,7 +34,7 @@ V2_2 = {
        obis.VALVE_POSITION_GAS: CosemParser(ValueParser(str)),
        obis.GAS_METER_READING: MBusParser(
            ValueParser(timestamp),
-            ValueParser(int),
+            ValueParser(str),  # changed to str see issue60
            ValueParser(int),
            ValueParser(int),
            ValueParser(str),  # obis ref
@@ -152,6 +152,7 @@ BELGIUM_FLUVIUS['objects'].update({

 LUXEMBOURG_SMARTY = deepcopy(V5)
 LUXEMBOURG_SMARTY['objects'].update({
+    obis.LUXEMBOURG_EQUIPMENT_IDENTIFIER: CosemParser(ValueParser(str)),
    obis.LUXEMBOURG_ELECTRICITY_USED_TARIFF_GLOBAL: CosemParser(ValueParser(Decimal)),
    obis.LUXEMBOURG_ELECTRICITY_DELIVERED_TARIFF_GLOBAL: CosemParser(ValueParser(Decimal)),
 })
@@ -6,8 +6,8 @@ setup(
    author='Nigel Dokter',
    author_email='nigel@nldr.net',
    url='https://github.com/ndokter/dsmr_parser',
-    version='0.21',
-    packages=find_packages(),
+    version='0.24',
+    packages=find_packages(exclude=('test', 'test.*')),
    install_requires=[
        'pyserial>=3,<4',
        'pyserial-asyncio<1',
@@ -1,5 +1,5 @@
 TELEGRAM_V2_2 = (
-    '/ISk5\2MT382-1004\r\n'
+    '/ISk5\\2MT382-1004\r\n'
    '\r\n'
    '0-0:96.1.1(00000000000000)\r\n'
    '1-0:1.8.1(00001.001*kWh)\r\n'
@@ -22,7 +22,7 @@ TELEGRAM_V2_2 = (
 )

 TELEGRAM_V3 = (
-    '/ISk5\2MT382-1000\r\n'
+    '/ISk5\\2MT382-1000\r\n'
    '\r\n'
    '0-0:96.1.1(4B384547303034303436333935353037)\r\n'
    '1-0:1.8.1(12345.678*kWh)\r\n'
@@ -87,7 +87,7 @@ TELEGRAM_V4_2 = (
 )

 TELEGRAM_V5 = (
-    '/ISk5\2MT382-1000\r\n'
+    '/ISk5\\2MT382-1000\r\n'
    '\r\n'
    '1-3:0.2.8(50)\r\n'
    '0-0:1.0.0(170102192002W)\r\n'
@@ -126,5 +126,5 @@ TELEGRAM_V5 = (
    '0-1:24.2.1(170102161005W)(00000.107*m3)\r\n'
    '0-2:24.1.0(003)\r\n'
    '0-2:96.1.0()\r\n'
-    '!87B3\r\n'
-)
+    '!6EEE\r\n'
+)
@@ -1,5 +1,5 @@
 [tox]
-envlist = py34,py35,py36,py37
+envlist = py35,py36,py37,py38

 [testenv]
 deps=
Author	SHA1	Message	Date
Nigel	684023d0b6	Preparing for release 0.24	2020-11-27 21:18:59 +01:00
Nigel	1a886aa03b	Merge pull request #62 from RobBie1221/add_lux_eq Add Luxembourg equipment identifier	2020-11-12 17:10:54 +01:00
Nigel	1c7535448e	Updated changelog and version	2020-11-07 08:56:24 +01:00
Rob Bierbooms	2a95d33c02	Add Luxembourg equipment identifier	2020-11-04 20:42:38 +01:00
Nigel	de6725dff8	Merge pull request #58 from dunajski/master Corrects example telegrams.	2020-11-03 21:29:35 +01:00
Nigel	1b1a3f505e	Merge pull request #59 from scop/dont-install-tests Do not install tests	2020-11-03 21:27:21 +01:00
Nigel	ebea385753	Merge pull request #61 from lowdef/issue60 issue#60 resolved issue with x-x:24.3.0 where it contains non-integer…	2020-11-03 21:25:39 +01:00
Hans Erik van Elburg	700cf6a2b3	issue#60 resolved issue with x-x:24.3.0 where it contains non-integer characters, parse 2nd value as string instead of integer	2020-11-02 00:29:03 +01:00
Ville Skyttä	7a687a99a6	Do not install tests	2020-10-18 10:49:09 +03:00
dunajski	86d665df39	Change README.md according to change in `ec1d37e` In `ec1d37ea08` changed example telegrams, so example telegram from README.md should be corrected too.	2020-09-28 11:35:47 +02:00
dunajski	ec1d37ea08	Corrects example telegrams. In example telegrams there a few mistakes in header strings. Using '\' in strings have special feature to add to string some non-printable characters, for example to add new line we can add \n for tab \t etc. So whenever we want to just print backslash as normal character we have to add another '\' before. In short string "On\\Off" prints "On\Off" ascii string. In enquired telegrams there are few strings with \2 sign in header, '/ISk5\2MT382-1000\r\n' and when we calculate CRC for whole given telegram part of "..\2.." is interpreted as one character (value 0x02) instead of two characters ('\', '2'). I think in a header in the example enlosed in P1 DSMR Companion Standard /ISk5\2.. stand for printable '\' and '2' character instead of "converted" to special '\2' character.	2020-09-28 10:22:16 +02:00
Nigel	0427ace079	Updated changelog	2020-08-23 09:36:31 +02:00
Nigel	addf9b590e	Merge pull request #55 from aequitas/exception Pass exception to log.exception as it is not called from within an ex…	2020-08-23 09:32:44 +02:00
Nigel	51f821a7fc	Merge pull request #49 from dupondje/fix_pycrc Improve CRC speed	2020-08-23 09:30:22 +02:00
Johan Bloemberg	5630520771	Pass exception to log.exception as it is not called from within an except: clause. Add Python 3.8 test support, drop Python 3.4 test support.	2020-07-21 10:31:40 +02:00
Jean-Louis Dupond	78419f6cc7	Improve CRC speed	2020-02-16 09:31:06 +01:00