From 2b447a4f5d1eba35259581c257652bdfb1e0afe7 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 8 Apr 2021 13:06:29 -0700 Subject: [PATCH 1/5] packet_size -> incoming_packet_length --- adafruit_ble_lywsd03mmc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_ble_lywsd03mmc.py b/adafruit_ble_lywsd03mmc.py index f47b1c3..d2b8b01 100644 --- a/adafruit_ble_lywsd03mmc.py +++ b/adafruit_ble_lywsd03mmc.py @@ -68,7 +68,7 @@ def temperature_humidity(self): """Return a tuple of (temperature, humidity).""" if self._readings_buf is None: self._readings_buf = bytearray( - self.readings.packet_size # pylint: disable=no-member + self.readings.incoming_packet_length # pylint: disable=no-member ) data = self._readings_buf length = self.readings.readinto(data) # pylint: disable=no-member From 31119a8cb9ff3aa4218975199ff81478f974c17c Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 8 Apr 2021 13:16:10 -0700 Subject: [PATCH 2/5] Remove unused import in example --- examples/ble_lywsd03mmc_simpletest.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/examples/ble_lywsd03mmc_simpletest.py b/examples/ble_lywsd03mmc_simpletest.py index 1c8d6d5..23b99f8 100644 --- a/examples/ble_lywsd03mmc_simpletest.py +++ b/examples/ble_lywsd03mmc_simpletest.py @@ -5,10 +5,7 @@ import time import adafruit_ble -from adafruit_ble.advertising.standard import ( - Advertisement, - ProvideServicesAdvertisement, -) +from adafruit_ble.advertising.standard import Advertisement from adafruit_ble_lywsd03mmc import LYWSD03MMCService # PyLint can't find BLERadio for some reason so special case it here. From e9636cb239b2d60bdec8a95c4b212bd491b202f6 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 8 Apr 2021 13:16:52 -0700 Subject: [PATCH 3/5] Remove unused import in lib --- adafruit_ble_lywsd03mmc.py | 1 - 1 file changed, 1 deletion(-) diff --git a/adafruit_ble_lywsd03mmc.py b/adafruit_ble_lywsd03mmc.py index d2b8b01..b2347e4 100644 --- a/adafruit_ble_lywsd03mmc.py +++ b/adafruit_ble_lywsd03mmc.py @@ -25,7 +25,6 @@ import struct import _bleio -from adafruit_ble.attributes import Attribute from adafruit_ble.services import Service from adafruit_ble.uuid import VendorUUID from adafruit_ble.characteristics import Characteristic, ComplexCharacteristic From a3ae263d84c6b456d235df07b9f93b68140843d9 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 8 Apr 2021 13:22:17 -0700 Subject: [PATCH 4/5] Remove disable Co-authored-by: Dan Halbert --- adafruit_ble_lywsd03mmc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_ble_lywsd03mmc.py b/adafruit_ble_lywsd03mmc.py index b2347e4..fc42a8c 100644 --- a/adafruit_ble_lywsd03mmc.py +++ b/adafruit_ble_lywsd03mmc.py @@ -67,7 +67,7 @@ def temperature_humidity(self): """Return a tuple of (temperature, humidity).""" if self._readings_buf is None: self._readings_buf = bytearray( - self.readings.incoming_packet_length # pylint: disable=no-member + self.readings.incoming_packet_length ) data = self._readings_buf length = self.readings.readinto(data) # pylint: disable=no-member From 38653bdb5230ceac6c514cb770ec4fbf7a4662bf Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Thu, 8 Apr 2021 16:27:38 -0400 Subject: [PATCH 5/5] cleanup --- adafruit_ble_lywsd03mmc.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/adafruit_ble_lywsd03mmc.py b/adafruit_ble_lywsd03mmc.py index fc42a8c..04edb2d 100644 --- a/adafruit_ble_lywsd03mmc.py +++ b/adafruit_ble_lywsd03mmc.py @@ -66,11 +66,9 @@ def __init__(self, service=None): def temperature_humidity(self): """Return a tuple of (temperature, humidity).""" if self._readings_buf is None: - self._readings_buf = bytearray( - self.readings.incoming_packet_length - ) + self._readings_buf = bytearray(self.readings.incoming_packet_length) data = self._readings_buf - length = self.readings.readinto(data) # pylint: disable=no-member + length = self.readings.readinto(data) if length > 0: low_temp, high_temp, hum = struct.unpack_from("