PySwitchbot 0.50.0__tar.gz → 0.51.0__tar.gz

{pyswitchbot-0.50.0 → pyswitchbot-0.51.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySwitchbot
-Version: 0.50.0
+Version: 0.51.0
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/Danielhiversen/pySwitchbot/
 Author: Daniel Hjelseth Hoyer

{pyswitchbot-0.50.0 → pyswitchbot-0.51.0}/PySwitchbot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySwitchbot
-Version: 0.50.0
+Version: 0.51.0
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/Danielhiversen/pySwitchbot/
 Author: Daniel Hjelseth Hoyer

{pyswitchbot-0.50.0 → pyswitchbot-0.51.0}/setup.py

@@ -10,7 +10,7 @@ setup(
         "cryptography>=39.0.0",
         "pyOpenSSL>=23.0.0",
     ],
-    version="0.50.0",
+    version="0.51.0",
     description="A library to communicate with Switchbot",
     author="Daniel Hjelseth Hoyer",
     url="https://github.com/Danielhiversen/pySwitchbot/",

{pyswitchbot-0.50.0 → pyswitchbot-0.51.0}/switchbot/adv_parsers/meter.py

@@ -1,13 +1,16 @@
 """Meter parser."""
 from __future__ import annotations
 
+import struct
 from typing import Any
 
+CO2_UNPACK = struct.Struct(">H").unpack_from
+
 
 def process_wosensorth(data: bytes | None, mfr_data: bytes | None) -> dict[str, Any]:
     """Process woSensorTH/Temp sensor services data."""
-    temp_data = None
-    battery = None
+    temp_data: bytes | None = None
+    battery: bytes | None = None
 
     if mfr_data:
         temp_data = mfr_data[8:11]
@@ -45,38 +48,8 @@ def process_wosensorth(data: bytes | None, mfr_data: bytes | None) -> dict[str,
 
 def process_wosensorth_c(data: bytes | None, mfr_data: bytes | None) -> dict[str, Any]:
     """Process woSensorTH/Temp sensor services data with CO2."""
-    temp_data = None
-    battery = None
-
-    if mfr_data:
-        temp_data = mfr_data[8:11]
-
-    if data:
-        if not temp_data:
-            temp_data = data[3:6]
-        battery = data[2] & 0b01111111
-
-    if not temp_data:
-        return {}
-
-    _temp_sign = 1 if temp_data[1] & 0b10000000 else -1
-    _temp_c = _temp_sign * (
-        (temp_data[1] & 0b01111111) + ((temp_data[0] & 0b00001111) / 10)
-    )
-    _temp_f = (_temp_c * 9 / 5) + 32
-    _temp_f = (_temp_f * 10) / 10
-    humidity = temp_data[2] & 0b01111111
-
-    if _temp_c == 0 and humidity == 0 and battery == 0:
-        return {}
-
-    _wosensorth_data = {
-        # Data should be flat, but we keep the original structure for now
-        "temp": {"c": _temp_c, "f": _temp_f},
-        "temperature": _temp_c,
-        "fahrenheit": bool(temp_data[2] & 0b10000000),
-        "humidity": humidity,
-        "battery": battery,
-    }
-
+    _wosensorth_data = process_wosensorth(data, mfr_data)
+    if _wosensorth_data and mfr_data and len(mfr_data) >= 15:
+        co2_data = mfr_data[13:15]
+        _wosensorth_data["co2"] = CO2_UNPACK(co2_data)[0]
     return _wosensorth_data

{pyswitchbot-0.50.0 → pyswitchbot-0.51.0}/tests/test_adv_parser.py

@@ -1599,9 +1599,6 @@ def test_meter_pro_passive() -> None:
         rssi=-67,
     )
     result = parse_advertisement_data(ble_device, adv_data, SwitchbotModel.METER_PRO)
-    import pprint
-
-    pprint.pprint(result)
     assert result == SwitchBotAdvertisement(
         address="aa:bb:cc:dd:ee:ff",
         data={
@@ -1643,6 +1640,7 @@ def test_meter_pro_c_active() -> None:
                 "humidity": 36,
                 "temp": {"c": 27.7, "f": 81.86},
                 "temperature": 27.7,
+                "co2": 725,
             },
             "isEncrypted": False,
             "model": "5",
@@ -1674,6 +1672,7 @@ def test_meter_pro_c_passive() -> None:
                 "humidity": 36,
                 "temp": {"c": 27.7, "f": 81.86},
                 "temperature": 27.7,
+                "co2": 725,
             },
             "isEncrypted": False,
             "model": "5",