much faster ble connection

python-test/poll.py

@@ -27,53 +27,96 @@ async def cache_services_characteristics(device, cb = None):
     global characteristicf, characteristic10
     global characteristic13, characteristic14
 
-    service3 = await device.service(serviceUuidVolcano3)
+    service3 = None
+    service4 = None
+    characteristic1 = None
+    characteristic3 = None
+    characteristicd = None
+    characteristicc = None
+    characteristicf = None
+    characteristic10 = None
+    characteristic13 = None
+    characteristic14 = None
+
+    val = 0
+
+    service3 = await device.service(serviceUuidVolcano3, 100)
     if cb != None:
-        await cb(0.1)
+        val += 1
+        await cb(val)
 
-    service4 = await device.service(serviceUuidVolcano4)
-    if cb != None:
-        await cb(0.2)
-
-    uuid1 = bluetooth.UUID("10110001-5354-4f52-5a26-4249434b454c")
-    characteristic1 = await service4.characteristic(uuid1)
-    if cb != None:
-        await cb(0.3)
+    uuidc = bluetooth.UUID("1010000c-5354-4f52-5a26-4249434b454c")
+    uuidd = bluetooth.UUID("1010000d-5354-4f52-5a26-4249434b454c")
+    async for c in service3.characteristics(None, 100):
+        if c.uuid == uuidc:
+            characteristicc = c
+            if cb != None:
+                val += 1
+                #await cb(val)
+
+        if c.uuid == uuidd:
+            characteristicd = c
+            if cb != None:
+                val += 1
+                #await cb(val)
 
-    uuid3 = bluetooth.UUID("10110003-5354-4f52-5a26-4249434b454c")
-    characteristic3 = await service4.characteristic(uuid3)
     if cb != None:
-        await cb(0.4)
+        await cb(val)
 
-    uuidd = bluetooth.UUID("1010000d-5354-4f52-5a26-4249434b454c")
-    characteristicd = await service3.characteristic(uuidd)
-    if cb != None:
-        await cb(0.5)
+    # -------------------------------------------------------------------------
 
-    uuidc = bluetooth.UUID("1010000c-5354-4f52-5a26-4249434b454c")
-    characteristicc = await service3.characteristic(uuidc)
+    service4 = await device.service(serviceUuidVolcano4, 100)
     if cb != None:
-        await cb(0.6)
+        val += 1
+        await cb(val)
 
+    uuid1 = bluetooth.UUID("10110001-5354-4f52-5a26-4249434b454c")
+    uuid3 = bluetooth.UUID("10110003-5354-4f52-5a26-4249434b454c")
     uuidf = bluetooth.UUID("1011000f-5354-4f52-5a26-4249434b454c")
-    characteristicf = await service4.characteristic(uuidf)
-    if cb != None:
-        await cb(0.7)
-
     uuid10 = bluetooth.UUID("10110010-5354-4f52-5a26-4249434b454c")
-    characteristic10 = await service4.characteristic(uuid10)
-    if cb != None:
-        await cb(0.8)
-
     uuid13 = bluetooth.UUID("10110013-5354-4f52-5a26-4249434b454c")
-    characteristic13 = await service4.characteristic(uuid13)
-    if cb != None:
-        await cb(0.9)
-
     uuid14 = bluetooth.UUID("10110014-5354-4f52-5a26-4249434b454c")
-    characteristic14 = await service4.characteristic(uuid14)
+    async for c in service4.characteristics(None, 100):
+        if c.uuid == uuid1:
+            characteristic1 = c
+            if cb != None:
+                val += 1
+                #await cb(val)
+
+        if c.uuid == uuid3:
+            characteristic3 = c
+            if cb != None:
+                val += 1
+                #await cb(val)
+
+        if c.uuid == uuidf:
+            characteristicf = c
+            if cb != None:
+                val += 1
+                #await cb(val)
+
+        if c.uuid == uuid10:
+            characteristic10 = c
+            if cb != None:
+                val += 1
+                #await cb(val)
+
+        if c.uuid == uuid13:
+            characteristic13 = c
+            if cb != None:
+                val += 1
+                #await cb(val)
+
+        if c.uuid == uuid14:
+            characteristic14 = c
+            if cb != None:
+                val += 1
+                #await cb(val)
+
     if cb != None:
-        await cb(1.0)
+        await cb(val)
+
+    return (val >= 10)
 
 async def get_current_temp(device):
     val = await characteristic1.read()

python-test/state_connect.py

@@ -14,7 +14,7 @@ class StateConnect:
 
     def enter(self, val = None):
         self.step = False
-        self.iteration = 0.0
+        self.iteration = 0
         self.done = False
         self.client = None
         self.connector = asyncio.create_task(self.connect(val))
@@ -43,7 +43,9 @@ class StateConnect:
             async with self.lock:
                 self.step = True
 
-            await cache_services_characteristics(client, self.progress)
+            success = await cache_services_characteristics(client, self.progress)
+            if not success:
+                raise RuntimeError("Error fetching characteristics")
         else:
             await d[0].disconnect()
             client = None
@@ -76,7 +78,7 @@ class StateConnect:
                     if self.step == False:
                         self.lcd.textC("Connecting...", int(self.lcd.width / 2), int(self.lcd.height / 2), self.lcd.white)
                     else:
-                        draw_graph(self.lcd, 0, int(self.iteration * 10), 10)
+                        draw_graph(self.lcd, 0, self.iteration, 10)
                         self.lcd.textC("Fetching parameters...", int(self.lcd.width / 2), int(self.lcd.height / 2) - 10, self.lcd.white, self.lcd.black)
 
         return -1