Merge branch 'master' into cpy5beta0-lightbox

Author: dhalbert

Bluetooth_Luminaries/code.py

@@ -5,13 +5,17 @@
 import neopixel
 import touchio
 import adafruit_fancyled.adafruit_fancyled as fancy
-# from adafruit_ble.uart import UARTServer
-# for >= CPy 5.0.0
-from adafruit_ble.uart_server import UARTServer
 from adafruit_bluefruit_connect.packet import Packet
 from adafruit_bluefruit_connect.button_packet import ButtonPacket
 from adafruit_bluefruit_connect.color_packet import ColorPacket
 
+
+from adafruit_ble import BLERadio
+from adafruit_ble.advertising.standard import ProvideServicesAdvertisement
+from adafruit_ble.services.nordic import UARTService
+
+
+
 NUM_LEDS = 24             # change to reflect your total number of ring LEDs
 RING_PIN = board.A1       # change to reflect your wiring
 CPX_PIN = board.D8        # CPX Neopixels live on pin D8
@@ -66,7 +70,11 @@
 offset_increment = 6
 OFFSET_MAX = 1000000
 
-uart_server = UARTServer()
+# Setup BLE
+ble = BLERadio()
+uart = UARTService()
+advertisement = ProvideServicesAdvertisement(uart)
+
 
 def set_palette(palette):
     for i in range(NUM_LEDS):
@@ -101,17 +109,17 @@ def set_palette(palette):
         set_palette(palette_choice)
         offset = (offset + offset_increment) % OFFSET_MAX
 
-    if not uart_server.connected and not advertising:
-        uart_server.start_advertising()
+    if not ble.connected and not advertising:
+        ble.start_advertising(advertisement)
         advertising = True
 
     # Are we connected via Bluetooth now?
-    if uart_server.connected:
+    if ble.connected:
         # Once we're connected, we're not advertising any more.
         advertising = False
         # Have we started to receive a packet?
-        if uart_server.in_waiting:
-            packet = Packet.from_stream(uart_server)
+        if uart.in_waiting:
+            packet = Packet.from_stream(uart)
             if isinstance(packet, ColorPacket):
                 cycling = False
                 # Set all the pixels to one color and stay there.

CircuitPython_BLE_Rover/circuitpython_ble_rover.py

@@ -9,7 +9,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)
 
 # motor setup
 motor_1 = crickit.dc_motor_1
@@ -46,16 +51,16 @@
 print("Use Adafruit Bluefruit app to connect")
 while True:
     blue_led.value = False
-    uart_server.start_advertising()
-    while not uart_server.connected:
+    ble.start_advertising(advertisement)
+    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, ColorPacket):
                 # Change the color.
                 color = packet.color