Updated version number

Merge pull request #43 from WoLpH/patch-1
`create_tcp_dsmr_reader` accepts `loop=None` but always expects a loop. Fixes: #36
2019-12-12 22:29:18 +01:00 · 2019-12-12 22:22:47 +01:00 · 2019-12-12 22:20:16 +01:00 · 2019-10-08 22:13:58 +02:00 · 2019-07-29 10:13:13 +02:00 · 2019-07-22 21:33:15 +02:00
4 changed files with 13 additions and 4 deletions
@@ -1,6 +1,14 @@
 Change Log
 ----------

+**0.15** (2019-12-12)
+
+- Fixed asyncio loop issue (`pull request #37 <https://github.com/ndokter/dsmr_parser/pull/36>`_).
+
+**0.14** (2019-10-08)
+
+- Changed serial reading to reduce CPU usage (`pull request #37 <https://github.com/ndokter/dsmr_parser/pull/37>`_).
+
 **0.13** (2019-03-04)

 - Fix DSMR v5.0 serial settings which were not used (`pull request #33 <https://github.com/ndokter/dsmr_parser/pull/33>`_).
@@ -49,12 +49,13 @@ def create_dsmr_reader(port, dsmr_version, telegram_callback, loop=None):
 def create_tcp_dsmr_reader(host, port, dsmr_version,
                           telegram_callback, loop=None):
    """Creates a DSMR asyncio protocol coroutine using TCP connection."""
+    if not loop:
+        loop = asyncio.get_event_loop()
    protocol, _ = create_dsmr_protocol(
-        dsmr_version, telegram_callback, loop=None)
+        dsmr_version, telegram_callback, loop=loop)
    conn = loop.create_connection(protocol, host, port)
    return conn

-
 class DSMRProtocol(asyncio.Protocol):
    """Assemble and handle incoming data into complete DSM telegrams."""

@@ -30,7 +30,7 @@ class SerialReader(object):
        """
        with serial.Serial(**self.serial_settings) as serial_handle:
            while True:
-                data = serial_handle.readline()
+                data = serial_handle.read(max(1, min(1024, serial_handle.in_waiting)))
                self.telegram_buffer.append(data.decode('ascii'))

                for telegram in self.telegram_buffer.get_all():
@@ -6,7 +6,7 @@ setup(
    author='Nigel Dokter',
    author_email='nigel@nldr.net',
    url='https://github.com/ndokter/dsmr_parser',
-    version='0.13',
+    version='0.15',
    packages=find_packages(),
    install_requires=[
        'pyserial>=3,<4',
Author	SHA1	Message	Date
Nigel	12aa003799	Updated version number	2019-12-12 22:29:18 +01:00
Nigel	86690ef44b	Merge pull request #43 from WoLpH/patch-1 `create_tcp_dsmr_reader` accepts `loop=None` but always expects a loop. Fixes: #36	2019-12-12 22:22:47 +01:00
Rick van Hattem	7c9c59308e	`create_tcp_dsmr_reader` accepts `loop=None` but always expects a loop. Fixes #36	2019-12-12 22:20:16 +01:00
Nigel	b31bcd61fc	Updated version number	2019-10-08 22:13:58 +02:00
Nigel Dokter	50a5cb9203	Merge pull request #37 from tneele/master Improve performance: read more data from serial port at once	2019-07-29 10:13:13 +02:00
Thomas Neele	8388624721	Read more data from serial port at once A telegram can contain dozens of lines. Reading them one by one is somewhat inefficient. With this change, the client tries to read all data that is available. This significantly reduced CPU load for me.	2019-07-22 21:33:15 +02:00