Use notification for getting response from Device

IATkachenko · IATkachenko · commit f6644e896a80 · 2020-06-09T21:11:35.000+03:00
diff --git a/tion/s3.py b/tion/s3.py
@@ -95,10 +95,20 @@ def process_mode(mode_code: int) -> str:
 
         try:
             self._do_action(self._connect)
-            self.notify.read()
+            self._enable_notifications()
             self._do_action(self._try_write, request=get_status_command())
-            byte_response = self._do_action(self.__try_get_state)
-            result = decode_response(byte_response)
+
+            i = 0
+            while i < 10:
+                if self._btle.waitForNotifications(1.0):
+                    byte_response = self._delegation.data
+                    result = decode_response(byte_response)
+                    break
+                i += 1
+            else:
+                _LOGGER.debug("Waiting too long for data")
+                self.notify.read()
+
         except TionException as e:
             _LOGGER.error(str(e))
             result = {"code": 400, "error": "Got exception " + str(e)}
@@ -134,7 +144,6 @@ def encode_status(status: str) -> int:
             return new_settings
         try:
             self._do_action(self._connect)
-            self.notify.read()
             self._do_action(self._try_write, request=encode_request(request))
         except TionException as e:
             _LOGGER.error(str(e))
diff --git a/tion/tion.py b/tion/tion.py
@@ -3,10 +3,29 @@
 from typing import Callable
 
 from bluepy import btle
+from bluepy.btle import DefaultDelegate
 
 _LOGGER = logging.getLogger(__name__)
 
 
+class TionDelegation(DefaultDelegate):
+    def __init__(self):
+        self._data = None
+        DefaultDelegate.__init__(self)
+
+    def handleNotification(self, cHandle, data):
+        self._data = data
+        _LOGGER.debug("%s", data)
+
+    def handleDiscovery(self, dev, isNewDev, isNewData):
+        if isNewDev:
+            _LOGGER.debug("Discovered device %s", dev.addr)
+        elif isNewData:
+            _LOGGER.debug("Received new data from %s", dev.addr)
+    @property
+    def data(self):
+        return self._data
+
 class TionException(Exception):
     def __init__(self, expression, message):
         self.expression = expression
@@ -21,6 +40,7 @@ class tion:
     def __init__(self, mac: str):
         self._mac = mac
         self._btle: btle.Peripheral = btle.Peripheral(None)
+        self._delegation = TionDelegation()
 
     @abc.abstractmethod
     def _send_request(self, request: bytearray) -> bytearray:
@@ -148,3 +168,17 @@ def _do_action(self, action: Callable, max_tries: int = 3, *args, **kwargs):
             raise TionException(action.__name__, message)
 
         return response
+
+    def _enable_notifications(self):
+        _LOGGER.debug("Enabling notification")
+        setup_data = b"\x01\x00"
+
+        _LOGGER.debug("Notify handler is %s", self.notify.getHandle())
+        notify_handle = self.notify.getHandle() + 1
+
+        _LOGGER.debug("Will write %s to %s handle", setup_data, notify_handle)
+        result = self._btle.writeCharacteristic(notify_handle, setup_data, withResponse=True)
+        _LOGGER.debug("Result is %s", result)
+        self._btle.withDelegate(self._delegation)
+        self.notify.read()
+        return result
