Skip to content

Commit 4cd2a03

Browse files
added requested changes from PR #49
1 parent b72365b commit 4cd2a03

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

adafruit_bme680.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,13 @@
3535

3636
try:
3737
# Used only for type annotations.
38+
39+
import typing # pylint: disable=unused-import
40+
41+
from circuitpython_typing import ReadableBuffer
3842
from busio import I2C, SPI
3943
from digitalio import DigitalInOut
44+
4045
except ImportError:
4146
pass
4247

@@ -111,7 +116,7 @@
111116
)
112117

113118

114-
def _read24(arr: bytearray) -> float:
119+
def _read24(arr: ReadableBuffer) -> float:
115120
"""Parse an unsigned 24-bit value as a floating point and return it."""
116121
ret = 0.0
117122
# print([hex(i) for i in arr])
@@ -392,10 +397,10 @@ def _read_byte(self, register: int) -> int:
392397
"""Read a byte register value and return it"""
393398
return self._read(register, 1)[0]
394399

395-
def _read(self, register: int, length: int) -> None:
400+
def _read(self, register: int, length: int) -> bytearray:
396401
raise NotImplementedError()
397402

398-
def _write(self, register: int, values) -> None:
403+
def _write(self, register: int, values: bytearray) -> None:
399404
raise NotImplementedError()
400405

401406

@@ -471,7 +476,7 @@ def _read(self, register: int, length: int) -> bytearray:
471476
print("\t$%02X => %s" % (register, [hex(i) for i in result]))
472477
return result
473478

474-
def _write(self, register: int, values: int) -> None:
479+
def _write(self, register: int, values: ReadableBuffer) -> None:
475480
"""Writes an array of 'length' bytes to the 'register'"""
476481
with self._i2c as i2c:
477482
buffer = bytearray(2 * len(values))
@@ -540,7 +545,7 @@ def __init__(
540545
debug: bool = False,
541546
*,
542547
refresh_rate: int = 10
543-
):
548+
) -> None:
544549
from adafruit_bus_device import ( # pylint: disable=import-outside-toplevel
545550
spi_device,
546551
)
@@ -549,7 +554,7 @@ def __init__(
549554
self._debug = debug
550555
super().__init__(refresh_rate=refresh_rate)
551556

552-
def _read(self, register: int, length: int):
557+
def _read(self, register: int, length: int) -> bytearray:
553558
if register != _BME680_REG_STATUS:
554559
# _BME680_REG_STATUS exists in both SPI memory pages
555560
# For all other registers, we must set the correct memory page
@@ -564,7 +569,7 @@ def _read(self, register: int, length: int):
564569
print("\t$%02X => %s" % (register, [hex(i) for i in result]))
565570
return result
566571

567-
def _write(self, register: int, values: int):
572+
def _write(self, register: int, values: ReadableBuffer) -> None:
568573
if register != _BME680_REG_STATUS:
569574
# _BME680_REG_STATUS exists in both SPI memory pages
570575
# For all other registers, we must set the correct memory page
@@ -579,7 +584,7 @@ def _write(self, register: int, values: int):
579584
if self._debug:
580585
print("\t$%02X <= %s" % (values[0], [hex(i) for i in values[1:]]))
581586

582-
def _set_spi_mem_page(self, register: int):
587+
def _set_spi_mem_page(self, register: int) -> None:
583588
spi_mem_page = 0x00
584589
if register < 0x80:
585590
spi_mem_page = 0x10

0 commit comments

Comments
 (0)