hardwear RST on driver close

Author: Tapasztó Lejla

libAnt/driver.py

@@ -7,7 +7,7 @@
 import usb
 
 from libAnt.constants import MESSAGE_TX_SYNC
-from libAnt.message import Message
+from libAnt.message import Message, SystemResetMessage
 
 
 class DriverException(Exception):
@@ -40,7 +40,8 @@ def open(self) -> None:
 
     def close(self) -> None:
         with self._lock:
-            self._close()
+            if self._isOpen:
+                self._close()
 
     def reOpen(self) -> None:
         with self._lock:
@@ -152,17 +153,15 @@ def __init__(self, vid, pid):
         self._packetSize = 0x20
         self._queue = None
         self._loop = None
+        self._driver_open = False
 
     def __str__(self):
         if self.isOpen():
             return str(self._dev)
         return "Closed"
 
     def _isOpen(self) -> bool:
-        if self._dev is not None:
-            if self._loop is not None:
-                return self._loop.is_alive()
-        return False
+        return self._driver_open
 
     def _open(self) -> None:
         print('USB OPEN START')
@@ -207,6 +206,7 @@ def _open(self) -> None:
             self._queue = Queue()
             self._loop = USBLoop(self._epIn, self._packetSize, self._queue)
             self._loop.start()
+            self._driver_open = True
             print('USB OPEN SUCCESS')
         except IOError as e:
             self._close()
@@ -219,10 +219,13 @@ def _close(self) -> None:
                 self._loop.stop()
                 self._loop.join()
         self._loop = None
-        print('USB releasing...')
-        #usb.util.release_interface(self._dev, self._interfaceNumber)
-        usb.util.dispose_resources(self._dev)
+        try:
+            self._dev.reset()
+            usb.util.dispose_resources(self._dev)
+        except:
+            pass
         self._dev = self._epOut = self._epIn = None
+        self._driver_open = False
         print('USB CLOSE END')
 
     def _read(self, count: int) -> bytes:

libAnt/message.py

@@ -82,7 +82,7 @@ def __init__(self):
 
 
 class SetNetworkKeyMessage(Message):
-    def __init__(self, channel: int, key: bytes):
+    def __init__(self, channel: int, key: bytes = ANTPLUS_NETWORK_KEY):
         content = bytearray([channel])
         content.extend(key)
         super().__init__(MESSAGE_NETWORK_KEY, bytes(content))

libAnt/node.py

@@ -37,7 +37,10 @@ def run(self):
         while not self.stopped():
             try:
                 with self._driver as d:
-                    # Init
+                    # Startup
+                    rst = SystemResetMessage()
+                    self._waiters.append(rst)
+                    d.write(rst)
                     for m in self._initMessages:
                         self._waiters.append(m)
                         d.write(m)

test.py

@@ -2,7 +2,9 @@
 from time import sleep
 
 from libAnt.driver import USBDriver
-from libAnt.node import Node
+from libAnt.message import SetNetworkKeyMessage
+from libAnt.node import Node, SystemResetMessage
+
 
 def callback(msg):
     print(msg)
@@ -12,7 +14,9 @@ def callback(msg):
 def eCallback(e):
     print('Error: ' + str(e))
 
-with Node(USBDriver(vid=0x0FCF, pid=0x1008), 'MyNode') as n:
+
+driver = USBDriver(vid=0x0FCF, pid=0x1008)
+with Node(driver, 'MyNode') as n:
     n.enableRxScanMode()
     n.start(callback, eCallback)
-    sleep(5)
+    sleep(10)