python-selve-new 2.5.5__tar.gz → 2.5.7__tar.gz

{python_selve_new-2.5.5 → python_selve_new-2.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-selve-new
-Version: 2.5.5
+Version: 2.5.7
 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.5 → python_selve_new-2.5.7}/python_selve_new.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-selve-new
-Version: 2.5.5
+Version: 2.5.7
 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.5 → python_selve_new-2.5.7}/selve/__init__.py

@@ -775,6 +775,16 @@ 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()
+        # Flush any stale messages left in the receive queue from the probe phase
+        # (unsolicited gateway events or responses the cancelled dispatch task never
+        # consumed).  If we don't do this, the dispatch loop matches those old
+        # messages against the new discover() command futures, resolving them with
+        # the wrong response object and causing silent discover failures.
+        self.rxQ = asyncio.Queue()
+        self._pending_futures.clear()
         await self.setEvents(0,0,0,0,0)
         rdy = await self.gatewayReady()
         if rdy:
@@ -1096,6 +1106,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)
@@ -1455,7 +1469,6 @@ class Selve:
             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)
@@ -1469,7 +1482,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)
@@ -1481,7 +1493,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)
@@ -1493,7 +1504,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)
@@ -1504,17 +1514,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.5 → python_selve_new-2.5.7}/selve/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.5.5'
-__version_tuple__ = version_tuple = (2, 5, 5)
+__version__ = version = '2.5.7'
+__version_tuple__ = version_tuple = (2, 5, 7)
 
-__commit_id__ = commit_id = 'g289213896'
+__commit_id__ = commit_id = 'gaf58df608'

{python_selve_new-2.5.5 → python_selve_new-2.5.7}/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):