Skip to content

advertising timeout not available on 5.x #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions adafruit_ble/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@ def start_advertising(
:param float interval: advertising interval, in seconds
:param int timeout: advertising timeout in seconds.
If None, no timeout.

``timeout`` is not available in CircuitPython 5.x and must be `None`.
"""
advertisement_bytes = bytes(advertisement)
scan_response_bytes = b""
Expand All @@ -183,13 +185,28 @@ def start_advertising(
scan_response.tx_power = self.tx_power
if scan_response:
scan_response_bytes = bytes(scan_response)
self._adapter.start_advertising(
advertisement_bytes,
scan_response=scan_response_bytes,
connectable=advertisement.connectable,
interval=interval,
timeout=0 if timeout is None else timeout,
)

# Remove after 5.x is no longer supported.
if (
sys.implementation.name == "circuitpython"
and sys.implementation.version[0] <= 5
):
if timeout is not None:
raise NotImplementedError("timeout not available for CircuitPython 5.x")
self._adapter.start_advertising(
advertisement_bytes,
scan_response=scan_response_bytes,
connectable=advertisement.connectable,
interval=interval,
)
else:
self._adapter.start_advertising(
advertisement_bytes,
scan_response=scan_response_bytes,
connectable=advertisement.connectable,
interval=interval,
timeout=0 if timeout is None else timeout,
)

def stop_advertising(self):
"""Stops advertising."""
Expand Down
6 changes: 4 additions & 2 deletions examples/ble_bluefruit_color_picker.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

import board
import neopixel

from adafruit_bluefruit_connect.packet import Packet
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
from adafruit_bluefruit_connect.packet import Packet
from adafruit_bluefruit_connect.color_packet import ColorPacket

ble = BLERadio()
uart_service = UARTService()
Expand Down
7 changes: 4 additions & 3 deletions examples/ble_demo_central.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@
import busio
import digitalio
import adafruit_lis3dh
from adafruit_ble import BLERadio
from adafruit_ble.advertising.standard import ProvideServicesAdvertisement
from adafruit_ble.services.nordic import UARTService
import neopixel

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


def scale(value):
"""Scale an value from (acceleration range) to 0-255 (RGB range)"""
Expand Down
8 changes: 4 additions & 4 deletions examples/ble_demo_periph.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
import board
import neopixel

from adafruit_ble import BLERadio
from adafruit_ble.advertising.standard import ProvideServicesAdvertisement
from adafruit_ble.services.nordic import UARTService

# 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

from adafruit_ble import BLERadio
from adafruit_ble.advertising.standard import ProvideServicesAdvertisement
from adafruit_ble.services.nordic import UARTService

NUM_PIXELS = 10
np = neopixel.NeoPixel(board.NEOPIXEL, NUM_PIXELS, brightness=0.1)
next_pixel = 0
Expand Down
6 changes: 4 additions & 2 deletions examples/ble_hid_periph.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
import sys
import time

from adafruit_hid.keyboard import Keyboard
from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS

import adafruit_ble
from adafruit_ble.advertising import Advertisement
from adafruit_ble.advertising.standard import ProvideServicesAdvertisement
from adafruit_ble.services.standard.hid import HIDService
from adafruit_ble.services.standard.device_info import DeviceInfoService
from adafruit_hid.keyboard import Keyboard
from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS


# Use default HID descriptor
hid = HIDService()
Expand Down