Updated changelog and version

Merge pull request #58 from dunajski/master
Corrects example telegrams.
2020-11-07 08:56:24 +01:00 · 2020-11-03 21:29:35 +01:00 · 2020-11-03 21:27:21 +01:00 · 2020-11-03 21:25:39 +01:00 · 2020-11-02 00:29:03 +01:00 · 2020-10-18 10:49:09 +03:00
5 changed files with 15 additions and 9 deletions
@@ -1,5 +1,11 @@
 Change Log
 ----------
+
+**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
@@ -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'
@@ -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
@@ -6,8 +6,8 @@ setup(
    author='Nigel Dokter',
    author_email='nigel@nldr.net',
    url='https://github.com/ndokter/dsmr_parser',
-    version='0.22',
-    packages=find_packages(),
+    version='0.23',
+    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'
+)
Author	SHA1	Message	Date
Nigel	1c7535448e	Updated changelog and version	2020-11-07 08:56:24 +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