Skip to content

Commit a9de053

Browse files
committed
Fix up docs and lint examples
1 parent 214e277 commit a9de053

10 files changed

+56
-65
lines changed

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ confidence=
5252
# no Warning level messages displayed, use"--disable=all --enable=classes
5353
# --disable=W"
5454
# disable=import-error,print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call
55-
disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,import-error
55+
disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,import-error,bad-continuation
5656

5757
# Enable the message, report, category or checker with the given id(s). You can
5858
# either give multiple identifier separated by comma (,) or put this option

README.rst

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,8 @@ This is easily achieved by downloading
2828

2929
Installing from PyPI
3030
=====================
31-
.. note:: This library is not available on PyPI yet. Install documentation is included
32-
as a standard element. Stay tuned for PyPI availability!
33-
34-
.. todo:: Remove the above note if PyPI version is/will be available at time of release.
35-
If the library is not planned for PyPI, remove the entire 'Installing from PyPI' section.
31+
.. note:: Only the bridge examples work on Raspberry Pi because Blinka `_bleio` doesn't support
32+
advertising, only scanning.
3633

3734
On supported GNU/Linux systems like the Raspberry Pi, you can install the driver locally `from
3835
PyPI <https://pypi.org/project/adafruit-circuitpython-ble_broadcastnet/>`_. To install for current user:
@@ -59,7 +56,7 @@ To install in a virtual environment in your current project:
5956
Usage Example
6057
=============
6158

62-
.. todo:: Add a quick, simple example. It and other examples should live in the examples folder and be included in docs/examples.rst.
59+
Add a secrets.py file and then run ``ble_broadcastnet_blinka_bridge.py``.
6360

6461
Contributing
6562
============

adafruit_ble_broadcastnet.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131

3232
import struct
3333
import time
34+
from micropython import const
3435
import adafruit_ble
3536
from adafruit_ble.advertising import Advertisement, LazyObjectField
3637
from adafruit_ble.advertising.standard import ManufacturerData, ManufacturerDataField
37-
from micropython import const
3838

3939
__version__ = "0.0.0-auto.0"
4040
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_BLE_BroadcastNet.git"
@@ -58,8 +58,8 @@ def broadcast(measurement, *, broadcast_time=0.1, extended=False):
5858

5959
device_address = "{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}".format( # pylint: disable=invalid-name
6060
*reversed(
61-
list(_ble._adapter.address.address_bytes)
62-
) # pylint: disable=protected-access
61+
list(_ble._adapter.address.address_bytes) # pylint: disable=protected-access
62+
)
6363
)
6464
"""Device address as a string."""
6565

docs/index.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@ Table of Contents
2323
.. toctree::
2424
:caption: Tutorials
2525

26-
.. todo:: Add any Learn guide links here. If there are none, then simply delete this todo and leave
27-
the toctree above for use later.
28-
2926
.. toctree::
3027
:caption: Related Products
3128

32-
.. todo:: Add any product links here. If there are none, then simply delete this todo and leave
33-
the toctree above for use later.
29+
Raspberry Pi 3B <https://www.adafruit.com/product/3055>
30+
Raspberry Pi 3B+ <https://www.adafruit.com/product/3775>
31+
Raspberry Pi Zero W <https://www.adafruit.com/product/3400>
32+
Raspberry Pi 4B 1GB <https://www.adafruit.com/product/4295>
33+
Raspberry Pi 4B 2GB <https://www.adafruit.com/product/4292>
34+
Raspberry Pi 4B 4GB <https://www.adafruit.com/product/4296>
3435

3536
.. toctree::
3637
:caption: Other Links

examples/ble_broadcastnet_battery_level.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import adafruit_ble_broadcastnet
1+
import time
22
import analogio
33
import board
4-
import math
54
import microcontroller
6-
import time
5+
import adafruit_ble_broadcastnet
76

87
print("This is BroadcastNet sensor:", adafruit_ble_broadcastnet.device_address)
98

@@ -13,10 +12,15 @@
1312
while True:
1413
measurement = adafruit_ble_broadcastnet.AdafruitSensorMeasurement()
1514
battery_voltage = (
16-
battery.value / 2 ** 16 * divider_ratio * battery.reference_voltage
15+
battery.value
16+
/ 2 ** 16
17+
* divider_ratio
18+
* battery.reference_voltage # pylint: disable=no-member
1719
)
1820
measurement.battery_voltage = int(battery_voltage * 1000)
19-
measurement.temperature = microcontroller.cpu.temperature
21+
measurement.temperature = (
22+
microcontroller.cpu.temperature # pylint: disable=no-member
23+
)
2024
print(measurement)
2125
adafruit_ble_broadcastnet.broadcast(measurement)
2226

examples/ble_broadcastnet_battery_level_neopixel.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import adafruit_ble_broadcastnet
1+
import time
22
import analogio
33
import board
4-
import math
54
import microcontroller
65
import neopixel
7-
import time
6+
import adafruit_ble_broadcastnet
87

98
print("This is BroadcastNet sensor:", adafruit_ble_broadcastnet.device_address)
109

@@ -16,15 +15,20 @@
1615
while True:
1716
measurement = adafruit_ble_broadcastnet.AdafruitSensorMeasurement()
1817
battery_voltage = (
19-
battery.value / 2 ** 16 * divider_ratio * battery.reference_voltage
18+
battery.value
19+
/ 2 ** 16
20+
* divider_ratio
21+
* battery.reference_voltage # pylint: disable=no-member
2022
)
2123
r = 16 - int(((battery_voltage - 3.6) / 0.6) * 16)
2224
r = min(16, max(r, 0))
2325
g = int(((battery_voltage - 3.6) / 0.6) * 16)
2426
g = min(16, max(g, 0))
2527
pixel[0] = r << 16 | g << 8
2628
measurement.battery_voltage = int(battery_voltage * 1000)
27-
measurement.temperature = microcontroller.cpu.temperature
29+
measurement.temperature = (
30+
microcontroller.cpu.temperature # pylint: disable=no-member
31+
)
2832
print(measurement)
2933
adafruit_ble_broadcastnet.broadcast(measurement)
3034
pixel[0] = 0

examples/ble_broadcastnet_wifi_bridge.py renamed to examples/ble_broadcastnet_blinka_bridge.py

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,10 @@
1+
"""This example bridges from BLE to Adafruit IO on a Raspberry Pi."""
2+
from secrets import secrets # pylint: disable=no-name-in-module
13
import time
4+
import requests
25
from adafruit_ble.advertising.standard import ManufacturerDataField
36
import adafruit_ble
47
import adafruit_ble_broadcastnet
5-
from secrets import secrets
6-
import sys
7-
8-
if sys.implementation.name == "cpython":
9-
import requests
10-
else:
11-
from adafruit_esp32spi import adafruit_esp32spi
12-
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
13-
14-
import board
15-
import busio
16-
from digitalio import DigitalInOut
17-
import adafruit_dotstar
18-
19-
esp32_cs = DigitalInOut(board.D13)
20-
esp32_ready = DigitalInOut(board.D11)
21-
esp32_reset = DigitalInOut(board.D12)
22-
23-
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
24-
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
25-
# esp._debug = 1
26-
27-
status_light = adafruit_dotstar.DotStar(
28-
board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2
29-
)
30-
requests = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(
31-
esp, secrets, status_light
32-
)
338

349
aio_auth_header = {"X-AIO-KEY": secrets["aio_key"]}
3510
aio_base_url = "https://io.adafruit.com/api/v2/" + secrets["aio_username"]
@@ -45,6 +20,10 @@ def aio_get(path, **kwargs):
4520
return requests.get(aio_base_url + path, **kwargs)
4621

4722

23+
# Disable outer names check because we frequently collide.
24+
# pylint: disable=redefined-outer-name
25+
26+
4827
def create_group(name):
4928
response = aio_post("/groups", json={"name": name})
5029
if response.status_code != 201:
@@ -102,7 +81,8 @@ def convert_to_feed_data(values, attribute_name, attribute_instance):
10281

10382

10483
ble = adafruit_ble.BLERadio()
105-
print("This is BroadcastNet bridge:", adafruit_ble_broadcastnet.device_address)
84+
bridge_address = adafruit_ble_broadcastnet.device_address
85+
print("This is BroadcastNet bridge:", bridge_address)
10686
print()
10787

10888
print("Fetching existing feeds.")
@@ -139,7 +119,6 @@ def convert_to_feed_data(values, attribute_name, attribute_instance):
139119
# Skip if we are getting the same broadcast more than once.
140120
if measurement.sequence_number == sequence_numbers[sensor_address]:
141121
continue
142-
# print(sensor_address, measurement, measurement.sequence_number, sequence_numbers[sensor_address])
143122
number_missed = measurement.sequence_number - sequence_numbers[sensor_address] - 1
144123
if number_missed < 0:
145124
number_missed += 256

examples/ble_broadcastnet_expo_backoff.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
report. When doing a report it will actually do multiple broadcasts and wait 2 ** n readings
44
until the next broadcast. The delay is reset every time the temp moves more than 1 degree."""
55

6-
import adafruit_ble_broadcastnet
6+
import math
7+
import time
78
import analogio
89
import board
9-
import math
1010
import microcontroller
11-
import time
11+
import adafruit_ble_broadcastnet
1212

1313
print("This is BroadcastNet sensor:", adafruit_ble_broadcastnet.device_address)
1414

@@ -18,7 +18,7 @@
1818
last_temperature = None
1919
consecutive = 1
2020
while True:
21-
temp = microcontroller.cpu.temperature
21+
temp = microcontroller.cpu.temperature # pylint: disable=no-member
2222
if not last_temperature or abs(temp - last_temperature) > 1:
2323
consecutive = 1
2424
last_temperature = temp
@@ -31,7 +31,10 @@
3131
if 2 ** exp == consecutive:
3232
measurement = adafruit_ble_broadcastnet.AdafruitSensorMeasurement()
3333
battery_voltage = (
34-
battery.value / 2 ** 16 * divider_ratio * battery.reference_voltage
34+
battery.value
35+
/ 2 ** 16
36+
* divider_ratio
37+
* battery.reference_voltage # pylint: disable=no-member
3538
)
3639
measurement.battery_voltage = int(battery_voltage * 1000)
3740
measurement.temperature = temp

examples/ble_broadcastnet_multisensor.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
"""This is a complex sensor node that uses the sensors on a Clue and Feather Bluefruit Sense."""
22

3+
import time
34
import board
45
import adafruit_bmp280
56
import adafruit_sht31d
6-
import adafruit_apds9960.apds9960
7+
8+
# import adafruit_apds9960.apds9960
79
import adafruit_lis3mdl
810
import adafruit_lsm6ds
911
import adafruit_ble_broadcastnet
10-
import time
1112

1213
print("This is BroadcastNet sensor:", adafruit_ble_broadcastnet.device_address)
1314

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
"""This is a basic sensor node that uses the internal temperature sensor and reports it every 10
22
seconds."""
33

4-
import adafruit_ble_broadcastnet
5-
import microcontroller
64
import time
5+
import microcontroller
6+
import adafruit_ble_broadcastnet
77

88
print("This is BroadcastNet sensor:", adafruit_ble_broadcastnet.device_address)
99

1010
while True:
1111
measurement = adafruit_ble_broadcastnet.AdafruitSensorMeasurement()
12-
measurement.temperature = microcontroller.cpu.temperature
12+
measurement.temperature = (
13+
microcontroller.cpu.temperature # pylint: disable=no-member
14+
)
1315
print(measurement)
1416
adafruit_ble_broadcastnet.broadcast(measurement)
1517
time.sleep(10)

0 commit comments

Comments
 (0)