Get RGB central and periph demo working

Author: dhalbert

adafruit_ble/advertising/__init__.py

@@ -90,7 +90,7 @@ def encode_data(data_dict, *, key_encoding="B"):
     return data
 
 class AdvertisingDataField:
-    """Top level class for any descriptor classes that live in Advertisement or it's subclasses."""
+    """Top level class for any descriptor classes that live in Advertisement or its subclasses."""
 
 class AdvertisingFlag:
     """A single bit flag within an AdvertisingFlags object."""

examples/ble_demo_central.py

@@ -7,43 +7,57 @@
 
 import board
 from analogio import AnalogIn
-
-# This hasn't been updated.
-
-#from adafruit_bluefruit_connect.packet import Packet
-# Only the packet classes that are imported will be known to Packet.
-from adafruit_bluefruit_connect.color_packet import ColorPacket
-
 import adafruit_ble
+from adafruit_ble import SmartAdapter
+from adafruit_ble.advertising.standard import ProvideServiceAdvertisement
 from adafruit_ble.services.nordic import UARTService
-from adafruit_ble.scanner import Scanner
+
+from adafruit_bluefruit_connect.color_packet import ColorPacket
 
 def scale(value):
     """Scale an value from 0-65535 (AnalogIn range) to 0-255 (RGB range)"""
     return int(value / 65535 * 255)
 
-scanner = Scanner()
+adapter = SmartAdapter()
+adafruit_ble.recognize_services(UARTService)
 
 a3 = AnalogIn(board.A3)
 a4 = AnalogIn(board.A4)
 a5 = AnalogIn(board.A5)
 
+uart_connection = None
+# See if any existing connections are providing UARTService.
+if adapter.connected:
+    for conn in adapter.connections:
+        if hasattr(conn, "uart"):
+            uart_connection = conn
+        break
+
 while True:
-    for peer in scanner.scan(UARTService):
-        peer.connect()
-
-    r = scale(a3.value)
-    g = scale(a4.value)
-    b = scale(a5.value)
-
-    color = (r, g, b)
-    print(color)
-    color_packet = ColorPacket(color)
-    for peer in adafruit_ble.peers:
-        if not hasattr(peer, "uart"):
-            continue
+    if not uart_connection:
+        print("Scanning...")
+        for adv in adapter.start_scan((ProvideServiceAdvertisement,), timeout=5):
+            if UARTService in adv.services:
+                print("found a UARTService advertisement")
+                uart_connection = adapter.connect(adv)
+                break
+        # Stop scanning whether or not we are connected.
+        adapter.stop_scan()
+
+    while uart_connection and uart_connection.connected:
+        r = scale(a3.value)
+        g = scale(a4.value)
+        b = scale(a5.value)
+
+        color = (r, g, b)
+        print(color)
+        color_packet = ColorPacket(color)
         try:
-            peer.uart.write(color_packet.to_bytes())
+            uart_connection.uart.write(color_packet.to_bytes())
         except OSError:
-            pass
-    time.sleep(0.3)
+            try:
+                uart_connection.disconnect()
+            except:
+                pass
+            uart_connection = None
+        time.sleep(0.3)

examples/ble_demo_periph.py

@@ -6,14 +6,14 @@
 import board
 import neopixel
 
-import adafruit_ble
+from adafruit_ble import SmartAdapter
+from adafruit_ble.advertising.standard import ProvideServiceAdvertisement
 from adafruit_ble.services.nordic import UARTService
-from adafruit_bluefruit_connect.packet import Packet
+
 # Only the packet classes that are imported will be known to Packet.
+from adafruit_bluefruit_connect.packet import Packet
 from adafruit_bluefruit_connect.color_packet import ColorPacket
 
-# This hasn't been updated.
-
 NUM_PIXELS = 32
 np = neopixel.NeoPixel(board.D10, NUM_PIXELS, brightness=0.1)
 next_pixel = 0
@@ -22,11 +22,17 @@ def mod(i):
     """Wrap i to modulus NUM_PIXELS."""
     return i % NUM_PIXELS
 
-adafruit_ble.add_local_service(UARTService)
-adafruit_ble.advertise(UARTService)
+
+adapter = SmartAdapter()
+uart = UARTService()
+advertisement = ProvideServiceAdvertisement(uart)
+
 while True:
-    for peer in adafruit_ble.peers:
-        packet = Packet.from_stream(peer.local.uart)
+    adapter.start_advertising(advertisement)
+    while not adapter.connected:
+        pass
+    while adapter.connected:
+        packet = Packet.from_stream(uart)
         if isinstance(packet, ColorPacket):
             print(packet.color)
             np[next_pixel] = packet.color