python-selve-new 2.5.4__tar.gz → 2.5.6__tar.gz

{python_selve_new-2.5.4 → python_selve_new-2.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-selve-new
-Version: 2.5.4
+Version: 2.5.6
 Summary: Python library for interfacing with selve devices using the USB-RF controller. Written completely new.
 Home-page: https://github.com/Kannix2005/python-selve-new
 Author: Stefan Altheimer

{python_selve_new-2.5.4 → python_selve_new-2.5.6}/python_selve_new.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-selve-new
-Version: 2.5.4
+Version: 2.5.6
 Summary: Python library for interfacing with selve devices using the USB-RF controller. Written completely new.
 Home-page: https://github.com/Kannix2005/python-selve-new
 Author: Stefan Altheimer

{python_selve_new-2.5.4 → python_selve_new-2.5.6}/selve/__init__.py

@@ -256,6 +256,8 @@ class Selve:
 
 
     async def startWorker(self):
+        if self._tx_task is not None and not self._tx_task.done():
+            return  # already running
         self._LOGGER.debug("Starting worker")
         self._pauseWorker.clear()
         self._stopThread.clear()
@@ -773,6 +775,9 @@ class Selve:
     async def discover(self):
 
         await self.stopWorker()
+        # Rebuild transport for a clean connection (avoids stale StreamReader state
+        # left over from _probe_port, which explains why USB-replug was needed).
+        await self._teardown_transport()
         await self.setEvents(0,0,0,0,0)
         rdy = await self.gatewayReady()
         if rdy:
@@ -1094,6 +1099,10 @@ class Selve:
                     dev.state = MovementState.UP_ON
                 elif response.command is DriveCommandCommeo.STOP:
                     dev.state = MovementState.STOPPED_OFF
+                elif response.command is DriveCommandCommeo.DRIVESTEPDOWN:
+                    dev.state = MovementState.DOWN_ON
+                elif response.command is DriveCommandCommeo.DRIVESTEPUP:
+                    dev.state = MovementState.UP_ON
                 self.addOrUpdateDevice(dev, SelveTypes.DEVICE)
             for id in response.failedIds:
                 dev = self.getDevice(id, SelveTypes.DEVICE)
@@ -1436,21 +1445,23 @@ class Selve:
     async def _movement_poll_loop(self, device_id: int, interval: float = 0.5, timeout: float = 60.0) -> None:
         """Poll DeviceGetValues every *interval* seconds until movement stops or timeout."""
         elapsed = 0.0
-        while not self._stopThread.is_set() and elapsed < timeout:
-            await asyncio.sleep(interval)
-            elapsed += interval
-            dev = self.getDevice(device_id, SelveTypes.DEVICE)
-            if dev is None or dev.state == MovementState.STOPPED_OFF:
-                break
-            await self.updateCommeoDeviceValuesAsync(device_id)
-        self._movement_tasks.pop(device_id, None)
+        try:
+            while not self._stopThread.is_set() and elapsed < timeout:
+                await asyncio.sleep(interval)
+                elapsed += interval
+                if self.getDevice(device_id, SelveTypes.DEVICE) is None:
+                    break
+                await self.updateCommeoDeviceValuesAsync(device_id)
+        except asyncio.CancelledError:
+            pass
+        finally:
+            self._movement_tasks.pop(device_id, None)
 
     async def moveDeviceUp(self, device: SelveDevice | IveoDevice, type=DeviceCommandType.MANUAL):
         if device.communicationType is CommunicationType.COMMEO:
             await self.executeCommand(CommandDriveUp(device.id, type))
             device.state = MovementState.UP_ON
             self.addOrUpdateDevice(device, SelveTypes.DEVICE)
-            await self.updateCommeoDeviceValuesAsync(device.id)
             self._start_movement_polling(device.id)
         else:
             self.setDeviceState(device.id, MovementState.UP_ON, SelveTypes.IVEO)
@@ -1464,7 +1475,6 @@ class Selve:
             await self.executeCommand(CommandDriveDown(device.id, type))
             device.state = MovementState.DOWN_ON
             self.addOrUpdateDevice(device, SelveTypes.DEVICE)
-            await self.updateCommeoDeviceValuesAsync(device.id)
             self._start_movement_polling(device.id)
         else:
             self.setDeviceState(device.id, MovementState.DOWN_ON, SelveTypes.IVEO)
@@ -1476,7 +1486,6 @@ class Selve:
     async def moveDevicePos1(self, device: SelveDevice | IveoDevice, type=DeviceCommandType.MANUAL):
         if device.communicationType is CommunicationType.COMMEO:
             await self.executeCommand(CommandDrivePos1(device.id, type))
-            await self.updateCommeoDeviceValuesAsync(device.id)
             self._start_movement_polling(device.id)
         else:
             self.setDeviceState(device.id, MovementState.UP_ON, SelveTypes.IVEO)
@@ -1488,7 +1497,6 @@ class Selve:
     async def moveDevicePos2(self, device: SelveDevice | IveoDevice, type=DeviceCommandType.MANUAL):
         if device.communicationType is CommunicationType.COMMEO:
             await self.executeCommand(CommandDrivePos2(device.id, type))
-            await self.updateCommeoDeviceValuesAsync(device.id)
             self._start_movement_polling(device.id)
         else:
             self.setDeviceState(device.id, MovementState.DOWN_ON, SelveTypes.IVEO)
@@ -1499,17 +1507,18 @@ class Selve:
 
     async def moveDevicePos(self, device: SelveDevice, pos: int = 0, type=DeviceCommandType.MANUAL):
         await self.executeCommand(CommandDrivePos(device.id, type, param=Util.percentageToValue(pos)))
-        await self.updateCommeoDeviceValuesAsync(device.id)
         self._start_movement_polling(device.id)
 
     async def moveDeviceStepUp(self, device: SelveDevice, degrees: int = 0, type=DeviceCommandType.MANUAL):
         await self.executeCommand(CommandDriveStepUp(device.id, type, param=Util.degreesToValue(degrees)))
-        await self.updateCommeoDeviceValuesAsync(device.id)
+        device.state = MovementState.UP_ON
+        self.addOrUpdateDevice(device, SelveTypes.DEVICE)
         self._start_movement_polling(device.id)
 
     async def moveDeviceStepDown(self, device: SelveDevice, degrees: int = 0, type=DeviceCommandType.MANUAL):
         await self.executeCommand(CommandDriveStepDown(device.id, type, param=Util.degreesToValue(degrees)))
-        await self.updateCommeoDeviceValuesAsync(device.id)
+        device.state = MovementState.DOWN_ON
+        self.addOrUpdateDevice(device, SelveTypes.DEVICE)
         self._start_movement_polling(device.id)
 
     async def stopDevice(self, device: SelveDevice | IveoDevice, type=DeviceCommandType.MANUAL):

{python_selve_new-2.5.4 → python_selve_new-2.5.6}/selve/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.5.4'
-__version_tuple__ = version_tuple = (2, 5, 4)
+__version__ = version = '2.5.6'
+__version_tuple__ = version_tuple = (2, 5, 6)
 
-__commit_id__ = commit_id = 'g5d6793713'
+__commit_id__ = commit_id = 'g74b26e3d1'

{python_selve_new-2.5.4 → python_selve_new-2.5.6}/selve/util/serial_transport.py

@@ -101,6 +101,7 @@ class SerialTransport:
             decoded = line_bytes.decode(errors="ignore").strip()
             if decoded == "":
                 if buffer and self._rx_queue:
+                    self._logger.debug("Serial RX: %s", buffer)
                     await self._rx_queue.put(buffer)
                     buffer = ""
                 continue

{python_selve_new-2.5.4 → python_selve_new-2.5.6}/tests/unit/test_mock_commands.py

@@ -72,9 +72,9 @@ class TestMockCommands(unittest.TestCase):
             # Check that the device state was updated
             self.assertEqual(self.commeo_device.state, MovementState.UP_ON)
             
-            # Check that device values were updated
-            self.selve.updateCommeoDeviceValuesAsync.assert_called_once_with(1)
-            
+            # updateCommeoDeviceValuesAsync is NOT called immediately; the poll loop handles updates
+            self.selve.updateCommeoDeviceValuesAsync.assert_not_called()
+
         self.loop.run_until_complete(test_async())
         
     def test_move_device_up_command_exception(self):