Merge branch 'master' into ooze-ice

Author: PaintYourDragon

CPB_Ornament_Proximity/cpb_ornament_proximity.py

@@ -0,0 +1,86 @@
+"""
+Circuit Playground Bluefruit Ornament Proximity
+This demo uses advertising to set the color of scanning devices depending on the strongest broadcast
+signal received. Circuit Playgrounds can be switched between advertising and scanning using the
+slide switch. The buttons change the color when advertising.
+"""
+
+import time
+from adafruit_circuitplayground.bluefruit import cpb
+
+from adafruit_ble import BLERadio
+from adafruit_ble.advertising.adafruit import AdafruitColor
+
+# The color pickers will cycle through this list with buttons A and B.
+color_options = [0x110000,
+                 0x111100,
+                 0x001100,
+                 0x001111,
+                 0x000011,
+                 0x110011,
+                 0x111111,
+                 0x221111,
+                 0x112211,
+                 0x111122]
+
+ble = BLERadio()
+
+i = 0
+advertisement = AdafruitColor()
+advertisement.color = color_options[i]
+cpb.pixels.auto_write = False
+cpb.pixels.fill(color_options[i])
+while True:
+    # The first mode is the color selector which broadcasts it's current color to other devices.
+    if cpb.switch:
+        print("Broadcasting color")
+        ble.start_advertising(advertisement)
+        while cpb.switch:
+            last_i = i
+            if cpb.button_a:
+                i += 1
+            if cpb.button_b:
+                i -= 1
+            i %= len(color_options)
+            if last_i != i:
+                color = color_options[i]
+                cpb.pixels.fill(color)
+                cpb.pixels.show()
+                print("New color {:06x}".format(color))
+                advertisement.color = color
+                ble.stop_advertising()
+                ble.start_advertising(advertisement)
+                time.sleep(0.5)
+        ble.stop_advertising()
+    # The second mode listens for color broadcasts and shows the color of the strongest signal.
+    else:
+        closest = None
+        closest_rssi = -80
+        closest_last_time = 0
+        print("Scanning for colors")
+        while not cpb.switch:
+            for entry in ble.start_scan(AdafruitColor, minimum_rssi=-100, timeout=1):
+                if cpb.switch:
+                    break
+                now = time.monotonic()
+                new = False
+                if entry.address == closest:
+                    pass
+                elif entry.rssi > closest_rssi or now - closest_last_time > 0.4:
+                    closest = entry.address
+                else:
+                    continue
+                closest_rssi = entry.rssi
+                closest_last_time = now
+                discrete_strength = min((100 + entry.rssi) // 5, 10)
+                cpb.pixels.fill(0x000000)
+                for i in range(0, discrete_strength):
+                    cpb.pixels[i] = entry.color
+                cpb.pixels.show()
+
+            # Clear the pixels if we haven't heard from anything recently.
+            now = time.monotonic()
+            if now - closest_last_time > 1:
+                cpb.pixels.fill(0x000000)
+                cpb.pixels.show()
+        ble.stop_scan()

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