Merge pull request #275 from plugwise/fix-usb-request-queue

Fix USB communication queue handling

Author: bouwew

CHANGELOG.md

@@ -5,6 +5,10 @@
 - Improved markdown (i.e. markup and contents), added linter for markdown & added code owners
 - Default to python 3.11
 
+## v0.27.8: Stick bugfix: fix for reported Plugwise-Beta issue [#347](https://github.com/plugwise/plugwise-beta/issues/347)
+
+- Change message request queue a FiFO queue
+
 ## v0.27.7: Stick bugfix: fix for reported issue #312
 
 - [#312](https://github.com/plugwise/plugwise-beta/issues/312)

plugwise/controller.py

@@ -13,7 +13,7 @@
 
 from datetime import datetime, timedelta
 import logging
-from queue import Empty, PriorityQueue
+from queue import Empty, SimpleQueue
 import threading
 import time
 
@@ -102,7 +102,7 @@ def connect_to_stick(self, callback=None) -> bool:
         if self.connection.connect():
             _LOGGER.debug("Starting message controller threads...")
             # send daemon
-            self._send_message_queue = PriorityQueue()
+            self._send_message_queue = SimpleQueue()
             self._send_message_thread_state = True
             self._send_message_thread = threading.Thread(
                 None, self._send_message_loop, "send_messages_thread", (), {}

plugwise/nodes/__init__.py

@@ -17,7 +17,6 @@
     NodeInfoResponse,
     NodeJoinAckResponse,
     NodePingResponse,
-    NodeResponse,
 )
 from ..util import validate_mac, version_to_model
 
@@ -180,7 +179,6 @@ def _request_ping(self, callback=None, ignore_sensor=True):
 
     def message_for_node(self, message):
         """Process received message."""
-        assert isinstance(message, NodeResponse)
         if message.mac == self._mac:
             if message.timestamp is not None:
                 _LOGGER.debug(

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "0.27.7"
+version         = "0.27.8"
 license         = {file = "LICENSE"}
 description     = "Plugwise Smile (Adam/Anna/P1), Stretch and USB (Stick) module for Python 3."
 readme          = "README.md"