Made ams work

Author: evaherrada

CircuitPython_Pyloton/code.py

@@ -18,36 +18,29 @@
 pyloton = pyloton.Pyloton(ble, display, 84.229)
 pyloton.show_splash()
 
+pyloton.ams_connect()
+
 hr_connection = None
-# Start with a fresh connection.
-if ble.connected:
-    for connection in ble.connections:
-        if HeartRateService in connection:
-            connection.disconnect()
-        break
 
 start = time.time()
 hr_connection = None
-speed_cad_connection = []
+speed_cad_connections = []
 radio = None
 while True:
     if not hr_connection:
         print("Running hr_connection")
         hr_connection = pyloton.heart_connect()
         ble.stop_scan()
-    if not speed_cad_connection:
+    if not speed_cad_connections:
         print("Running speed_cad_connection")
-        speed_cad_connection = pyloton.speed_cad_connect()
-    if not radio:
-        print("Running ams_connection")
-        radio = pyloton.ams_connect()
+        speed_cad_connections = pyloton.speed_cad_connect()
 
     if time.time()-start >= 45:
         pyloton.timeout()
         break
     # Stop scanning whether or not we are connected.
     ble.stop_scan()
-    if hr_connection and hr_connection.connected and speed_cad_connection and radio.connected:
+    if hr_connection and hr_connection.connected and speed_cad_connections:
         print("Fetch connection")
         hr_service = hr_connection[HeartRateService]
         print("Location:", hr_service.location)

CircuitPython_Pyloton/pyloton.py

@@ -10,7 +10,7 @@
 from adafruit_display_shapes.rect import Rect
 from adafruit_display_text import label
 
-from adafruit_ble_apple_media import AppleMediaService 
+from adafruit_ble_apple_media import AppleMediaService
 
 
 class Pyloton:
@@ -164,13 +164,16 @@ def ams_connect(self):
 
         self._status_update("Connected")
 
+        known_notifications = set()
+
         for connection in radio.connections:
             if not connection.paired:
                 connection.pair()
                 self._status_update("paired")
-        known_notifications = set()
+
+        self.ams = connection[AppleMediaService]
+
         self.radio = radio
-        return self.radio
 
 
     def speed_cad_connect(self):
@@ -270,11 +273,13 @@ def icon_maker(self, n, icon_x, icon_y):
         return sprite
 
 
-    def _label_maker(self, text, x, y):
+    def _label_maker(self, text, x, y, font=None):
         """
         Generates labels
         """
-        return label.Label(font=self.arial24, x=x, y=y, text=text, color=self.WHITE)
+        if not font:
+            font = self.arial24
+        return label.Label(font=font, x=x, y=y, text=text, color=self.WHITE)
 
 
     def _get_y(self):
@@ -362,13 +367,14 @@ def update_display(self, hr_service):
                 self.splash.append(cad_label)
 
         if self.ams_enabled:
-            ams_label = self._label_maker('None', 50, self.ams_y) # 210
+            ams_label = self._label_maker('{}'.format(self.ams.title), 50, self.ams_y, font=self.arial16) # 210
             if self.setup:
                 self.splash[6] = ams_label
             else:
                 self.splash.append(ams_label)
 
 
         self.setup=True
+        time.sleep(0.1)
 
         self.display.show(self.splash)