Merge branch 'master' into jerryn_snowglobe

Author: dhalbert

BLE_Crickit_Light_Switch/ble_crickit_light_switch.py

@@ -1,6 +1,6 @@
 # BLE Crickit Light Switch
 # Use with the Adafruit BlueFruit LE Connect app
-# Works with CircuitPython 4.0.0-beta.1 and later
+# Works with CircuitPython 5.0.0-beta.0 and later
 # running on an nRF52840 Feather board and Crickit FeatherWing
 # micro servo, 3D printed switch actuator
 
@@ -10,7 +10,10 @@
 import digitalio
 
 from adafruit_crickit import crickit
-from adafruit_ble.uart import UARTServer
+
+from adafruit_ble import BLERadio
+from adafruit_ble.advertising.standard import ProvideServicesAdvertisement
+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.
@@ -22,7 +25,9 @@
 blue_led.direction = digitalio.Direction.OUTPUT
 red_led.direction = digitalio.Direction.OUTPUT
 
-uart_server = UARTServer()
+ble = BLERadio()
+uart_service = UARTService()
+advertisement = ProvideServicesAdvertisement(uart_service)
 
 UP_ANGLE = 180
 NEUTRAL_ANGLE = 120
@@ -35,17 +40,17 @@
 print("Use Adafruit Bluefruit app to connect")
 while True:
     blue_led.value = False
-    uart_server.start_advertising()
+    ble.start_advertising(advertisement)
 
-    while not uart_server.connected:
+    while not ble.connected:
         # Wait for a connection.
         pass
     blue_led.value = True  # turn on blue LED when connected
-    while uart_server.connected:
-        if uart_server.in_waiting:
+    while ble.connected:
+        if uart_service.in_waiting:
             # Packet is arriving.
             red_led.value = False  # turn off red LED
-            packet = Packet.from_stream(uart_server)
+            packet = Packet.from_stream(uart_service)
             if isinstance(packet, ButtonPacket) and packet.pressed:
                 red_led.value = True  # blink to show a packet has been received
                 if packet.button == ButtonPacket.UP and angle != UP_ANGLE:  # UP button pressed

Circuit_Playground_Bluefruit_Color_Remote/cpb_remote_color_client.py

@@ -12,37 +12,48 @@
 # Only the packet classes that are imported will be known to Packet.
 from adafruit_bluefruit_connect.color_packet import ColorPacket
 
-from adafruit_ble.scanner import Scanner
-from adafruit_ble.uart_client import UARTClient
+from adafruit_ble import BLERadio
+from adafruit_ble.advertising.standard import ProvideServicesAdvertisement
+from adafruit_ble.services.nordic import UARTService
 
 def scale(value):
     """Scale an value from 0-65535 (AnalogIn range) to 0-255 (RGB range)"""
     return int(value / 65535 * 255)
 
-scanner = Scanner()
-uart_client = UARTClient()
+ble = BLERadio()
 
-a3 = AnalogIn(board.A4)
-a4 = AnalogIn(board.A5)
-a5 = AnalogIn(board.A6)
+a4 = AnalogIn(board.A4)
+a5 = AnalogIn(board.A5)
+a6 = AnalogIn(board.A6)
 
-while True:
-    uart_addresses = []
-    # Keep trying to find a UART peripheral
-    while not uart_addresses:
-        uart_addresses = uart_client.scan(scanner)
-    uart_client.connect(uart_addresses[0], 5)
+uart_connection = None
+
+# See if any existing connections are providing UARTService.
+if ble.connected:
+    for connection in ble.connections:
+        if UARTService in connection:
+            uart_connection = connection
+        break
 
-    while uart_client.connected:
-        r = scale(a3.value)
-        g = scale(a4.value)
-        b = scale(a5.value)
+while True:
+    if not uart_connection:
+        for adv in ble.start_scan(ProvideServicesAdvertisement, timeout=5):
+            if UARTService in adv.services:
+                uart_connection = ble.connect(adv)
+                break
+        # Stop scanning whether or not we are connected.
+        ble.stop_scan()
+
+    while uart_connection and uart_connection.connected:
+        r = scale(a4.value)
+        g = scale(a5.value)
+        b = scale(a6.value)
 
         color = (r, g, b)
         print(color)
         color_packet = ColorPacket(color)
         try:
-            uart_client.write(color_packet.to_bytes())
+            uart_connection[UARTService].write(color_packet.to_bytes())
         except OSError:
             pass
         time.sleep(0.3)

Circuit_Playground_Bluefruit_Color_Remote/cpb_remote_color_periph.py

@@ -6,12 +6,17 @@
 import board
 import neopixel
 
-from adafruit_ble.uart_server import UARTServer
+from adafruit_ble import BLERadio
+from adafruit_ble.advertising.standard import ProvideServicesAdvertisement
+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.color_packet import ColorPacket
 
-uart_server = UARTServer()
+ble = BLERadio()
+uart = UARTService()
+advertisement = ProvideServicesAdvertisement(uart)
 
 NUM_PIXELS = 10
 np = neopixel.NeoPixel(board.NEOPIXEL, NUM_PIXELS, brightness=0.1)
@@ -23,12 +28,12 @@ def mod(i):
 
 while True:
     # Advertise when not connected.
-    uart_server.start_advertising()
-    while not uart_server.connected:
+    ble.start_advertising(advertisement)
+    while not ble.connected:
         pass
 
-    while uart_server.connected:
-        packet = Packet.from_stream(uart_server)
+    while ble.connected:
+        packet = Packet.from_stream(uart)
         if isinstance(packet, ColorPacket):
             print(packet.color)
             np[next_pixel] = packet.color

Turtle_BLE_CPB_Crickit_Rover/turtle_ble_cpb_crickit_rover.py

@@ -1,14 +1,17 @@
 # Circuit Playground Bluefruit Rover
 # Use with the Adafruit BlueFruit LE Connect app
-# Works with CircuitPython 4.0.0-beta.1 and later
+# Works with CircuitPython 5.0.0-beta.0 and later
 # running on an nRF52840 CPB board and Crickit
 
 import time
 import board
 import digitalio
 import neopixel
 from adafruit_crickit import crickit
-from adafruit_ble.uart_server import UARTServer
+
+from adafruit_ble import BLERadio
+from adafruit_ble.advertising.standard import ProvideServicesAdvertisement
+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.
@@ -19,7 +22,9 @@
 red_led = digitalio.DigitalInOut(board.D13)
 red_led.direction = digitalio.Direction.OUTPUT
 
-uart_server = UARTServer()
+ble = BLERadio()
+uart_service = UARTService()
+advertisement = ProvideServicesAdvertisement(uart_service)
 
 # motor setup
 motor_1 = crickit.dc_motor_1
@@ -42,21 +47,20 @@
 print("BLE Turtle Rover")
 print("Use Adafruit Bluefruit app to connect")
 while True:
-    # blue_led.value = False
     neopixels[0] = BLACK
     neopixels.show()
-    uart_server.start_advertising()
-    while not uart_server.connected:
+    ble.start_advertising(advertisement)
+    while not ble.connected:
         # Wait for a connection.
         pass
     # set a pixel blue when connected
     neopixels[0] = BLUE
     neopixels.show()
-    while uart_server.connected:
-        if uart_server.in_waiting:
+    while ble.connected:
+        if uart_service.in_waiting:
             # Packet is arriving.
             red_led.value = False  # turn off red LED
-            packet = Packet.from_stream(uart_server)
+            packet = Packet.from_stream(uart_service)
             if isinstance(packet, ColorPacket):
                 # Change the color.
                 color = packet.color