make sure connection graph finishes

python-test/poll.py

@@ -52,16 +52,13 @@ async def cache_services_characteristics(device, cb = None):
             characteristicc = c
             if cb != None:
                 val += 1
-                #await cb(val)
+                await cb(val)
 
         if c.uuid == uuidd:
             characteristicd = c
             if cb != None:
                 val += 1
-                #await cb(val)
-
-    if cb != None:
-        await cb(val)
+                await cb(val)
 
     # -------------------------------------------------------------------------
 
@@ -81,40 +78,37 @@ async def cache_services_characteristics(device, cb = None):
             characteristic1 = c
             if cb != None:
                 val += 1
-                #await cb(val)
+                await cb(val)
 
         if c.uuid == uuid3:
             characteristic3 = c
             if cb != None:
                 val += 1
-                #await cb(val)
+                await cb(val)
 
         if c.uuid == uuidf:
             characteristicf = c
             if cb != None:
                 val += 1
-                #await cb(val)
+                await cb(val)
 
         if c.uuid == uuid10:
             characteristic10 = c
             if cb != None:
                 val += 1
-                #await cb(val)
+                await cb(val)
 
         if c.uuid == uuid13:
             characteristic13 = c
             if cb != None:
                 val += 1
-                #await cb(val)
+                await cb(val)
 
         if c.uuid == uuid14:
             characteristic14 = c
             if cb != None:
                 val += 1
-                #await cb(val)
-
-    if cb != None:
-        await cb(val)
+                await cb(val)
 
     return (val >= 10)
 

python-test/state_connect.py

@@ -66,19 +66,19 @@ class StateConnect:
                 return 0
 
         async with self.lock:
+            if self.state == False:
+                self.lcd.textC("Disconnecting...", int(self.lcd.width / 2), int(self.lcd.height / 2), self.lcd.white)
+            else:
+                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, 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)
+
             if self.done:
                 if self.state:
                     return 3
                 else:
                     return 0
-            else:
-                if self.state == False:
-                    self.lcd.textC("Disconnecting...", int(self.lcd.width / 2), int(self.lcd.height / 2), self.lcd.white)
-                else:
-                    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, 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