Merge remote-tracking branch 'adafruit/master'

Author: dastels

.gitignore

@@ -3,3 +3,4 @@ Hue_Controller/secrets.h
 .idea
 *.DS_Store
 CircuitPython_Logger/secrets\.py
+.python-version

.travis.yml

@@ -15,7 +15,7 @@ cache:
 
 env:
   global:
-    - ARDUINO_IDE_VERSION="1.8.7"
+    - ARDUINO_IDE_VERSION="1.8.11"
     - PRETTYNAME="Adafruit Learning System Guides"
     - PLATFORM_CHECK_ONLY_ON_FILE=true
 

Adafruit_ESP32_Arduino_Demos/SerialESPPassthrough/Airlift-BitsyWing-FeatherWing-Passthru.UF2

@@ -10,12 +10,13 @@
 import adafruit_dotstar
 import pulseio
 import board
+import usb_hid
 
 led = adafruit_dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1)
 
 # The keyboard object!
 time.sleep(1)  # Sleep for a bit to avoid a race condition on some systems
-keyboard = Keyboard()
+keyboard = Keyboard(usb_hid.devices)
 keyboard_layout = KeyboardLayoutUS(keyboard)  # We're in the US :)
 
 # our infrared pulse decoder helpers

Adafruit_pIRKey/NEC_keyboard_example.py

@@ -8,10 +8,11 @@
 import adafruit_dotstar
 import adafruit_irremote
 import time
+import usb_hid
 
 # The keyboard object!
 time.sleep(1)  # Sleep for a bit to avoid a race condition on some systems
-keyboard = Keyboard()
+keyboard = Keyboard(usb_hid.devices)
 keyboard_layout = KeyboardLayoutUS(keyboard)  # We're in the US :)
 
 led = adafruit_dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1)

Adafruit_pIRKey/raw_code_keyboard/main.py

@@ -4,6 +4,7 @@
 from adafruit_hid.keyboard import Keyboard
 from adafruit_hid.keycode import Keycode
 import board
+import usb_hid
 
 # A simple neat keyboard demo in circuitpython
 
@@ -16,7 +17,7 @@
 controlkey = Keycode.LEFT_CONTROL
 
 # the keyboard object!
-kbd = Keyboard()
+kbd = Keyboard(usb_hid.devices)
 # our array of button objects
 buttons = []
 leds = []

Arcade_Button_Control_Box/Arcade_Button_Control_Box.py

@@ -14,13 +14,15 @@
 
 import time
 import board
-import simpleio
+import pulseio
 from adafruit_circuitplayground.express import cpx
+from adafruit_motor import servo
 
-servo = simpleio.Servo(board.A1)
+pwm = pulseio.PWMOut(board.A1, duty_cycle=2 ** 15, frequency=50)
+my_servo = servo.Servo(pwm)
 
 cpx.pixels.fill((0, 0, 0))
-servo.angle = 90
+my_servo.angle = 90
 
 while True:
     light_level = cpx.light
@@ -30,8 +32,8 @@
     else:
         cpx.pixels.fill((0, 0, 0))
         if light_level < 200:
-            servo.angle = 90
+            my_servo.angle = 90
         else:
-            servo.angle = 0
+            my_servo.angle = 0
 
     time.sleep(0.25)

AutoSunglasses/code.py

@@ -0,0 +1,27 @@
+# CircuitPython NeoPixel Color Picker Example
+
+import board
+import neopixel
+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
+from adafruit_bluefruit_connect.color_packet import ColorPacket
+
+ble = BLERadio()
+uart_service = UARTService()
+advertisement = ProvideServicesAdvertisement(uart_service)
+
+pixels = neopixel.NeoPixel(board.NEOPIXEL, 10, brightness=0.1)
+
+while True:
+    # Advertise when not connected.
+    ble.start_advertising(advertisement)
+    while not ble.connected:
+        pass
+
+    while ble.connected:
+        packet = Packet.from_stream(uart_service)
+        if isinstance(packet, ColorPacket):
+            print(packet.color)
+            pixels.fill(packet.color)

BLE_CPB_Color_Picker/ble_color_picker.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

BLE_Crickit_Light_Switch/ble_crickit_light_switch.py

@@ -0,0 +1,169 @@
+"""
+Heart Rate Trainer
+Read heart rate data from a heart rate peripheral using the standard BLE
+Heart Rate service.
+Displays BPM value to Seven Segment FeatherWing
+Displays percentage of max heart rate on another 7Seg FeatherWing
+"""
+
+import time
+import board
+
+import adafruit_ble
+from adafruit_ble.advertising.standard import ProvideServicesAdvertisement
+from adafruit_ble.services.standard.device_info import DeviceInfoService
+from adafruit_ble_heart_rate import HeartRateService
+
+from adafruit_ht16k33.segments import Seg7x4
+
+from digitalio import DigitalInOut, Direction
+
+# Feather on-board status LEDs setup
+red_led = DigitalInOut(board.RED_LED)
+red_led.direction = Direction.OUTPUT
+red_led.value = True
+
+blue_led = DigitalInOut(board.BLUE_LED)
+blue_led.direction = Direction.OUTPUT
+blue_led.value = False
+
+# target heart rate for interval training
+# Change this number depending on your max heart rate, usually figured
+# as (220 - your age).
+max_rate = 180
+
+# Seven Segment FeatherWing setup
+i2c = board.I2C()
+display_A = Seg7x4(i2c, address=0x70)  # this will be the BPM display
+display_A.brightness = 15
+display_A.fill(0)  # Clear the display
+# Second display has A0 address jumpered
+display_B = Seg7x4(i2c, address=0x71)  # this will be the % target display
+display_B.brightness = 15
+display_B.fill(0)  # Clear the display
+
+# display_A "b.P.M."
+display_A.set_digit_raw(0, 0b11111100)
+display_A.set_digit_raw(1, 0b11110011)
+display_A.set_digit_raw(2, 0b00110011)
+display_A.set_digit_raw(3, 0b10100111)
+# display_B "Prct"
+display_B.set_digit_raw(0, 0b01110011)
+display_B.set_digit_raw(1, 0b01010000)
+display_B.set_digit_raw(2, 0b01011000)
+display_B.set_digit_raw(3, 0b01000110)
+time.sleep(3)
+
+display_A.fill(0)
+for h in range(4):
+    display_A.set_digit_raw(h, 0b10000000)
+# display_B show maximum heart rate value
+display_B.fill(0)
+display_B.print(max_rate)
+time.sleep(2)
+
+# PyLint can't find BLERadio for some reason so special case it here.
+ble = adafruit_ble.BLERadio()    # pylint: disable=no-member
+
+hr_connection = None
+
+def display_SCAN():
+    display_A.fill(0)
+    display_A.set_digit_raw(0, 0b01101101)
+    display_A.set_digit_raw(1, 0b00111001)
+    display_A.set_digit_raw(2, 0b01110111)
+    display_A.set_digit_raw(3, 0b00110111)
+
+
+def display_bLE():
+    display_B.fill(0)
+    display_B.set_digit_raw(0, 0b00000000)
+    display_B.set_digit_raw(1, 0b01111100)
+    display_B.set_digit_raw(2, 0b00111000)
+    display_B.set_digit_raw(3, 0b01111001)
+
+def display_dots():  # "...."
+    for j in range(4):
+        display_A.set_digit_raw(j, 0b10000000)
+        display_B.set_digit_raw(j, 0b10000000)
+
+def display_dashes():  # "----"
+    for k in range(4):
+        display_A.set_digit_raw(k, 0b01000000)
+        display_B.set_digit_raw(k, 0b01000000)
+
+# Start with a fresh connection.
+if ble.connected:
+    display_SCAN()
+    display_bLE()
+    time.sleep(1)
+
+    for connection in ble.connections:
+        if HeartRateService in connection:
+            connection.disconnect()
+        break
+
+while True:
+    print("Scanning...")
+    red_led.value = True
+    blue_led.value = False
+    display_SCAN()
+    display_bLE()
+    time.sleep(1)
+
+
+    for adv in ble.start_scan(ProvideServicesAdvertisement, timeout=5):
+        if HeartRateService in adv.services:
+            print("found a HeartRateService advertisement")
+            hr_connection = ble.connect(adv)
+            display_dots()
+            time.sleep(2)
+            print("Connected")
+            blue_led.value = True
+            red_led.value = False
+            break
+
+    # Stop scanning whether or not we are connected.
+    ble.stop_scan()
+    print("Stopped scan")
+    red_led.value = False
+    blue_led.value = True
+    time.sleep(0.5)
+
+    if hr_connection and hr_connection.connected:
+        print("Fetch connection")
+        if DeviceInfoService in hr_connection:
+            dis = hr_connection[DeviceInfoService]
+            try:
+                manufacturer = dis.manufacturer
+            except AttributeError:
+                manufacturer = "(Manufacturer Not specified)"
+            try:
+                model_number = dis.model_number
+            except AttributeError:
+                model_number = "(Model number not specified)"
+            print("Device:", manufacturer, model_number)
+        else:
+            print("No device information")
+        hr_service = hr_connection[HeartRateService]
+        print("Location:", hr_service.location)
+
+        while hr_connection.connected:
+            values = hr_service.measurement_values
+            print(values)  # returns the full heart_rate data set
+            if values:
+                bpm = (values.heart_rate)
+                if bpm is not 0:
+                    pct_target = (round(100*(bpm/max_rate)))
+                display_A.fill(0)  # clear the display
+                display_B.fill(0)
+                if values.heart_rate is 0:
+                    display_dashes()
+                else:
+                    display_A.fill(0)
+                    display_B.print(pct_target)
+                    time.sleep(0.1)
+                    display_A.print(bpm)
+
+            time.sleep(0.9)
+            display_A.set_digit_raw(0, 0b00000000)