PySwitchbot 2.3.0__tar.gz → 2.4.1__tar.gz

{pyswitchbot-2.3.0 → pyswitchbot-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySwitchbot
-Version: 2.3.0
+Version: 2.4.1
 Summary: A library to communicate with Switchbot
 License: MIT
 License-File: LICENSE

{pyswitchbot-2.3.0 → pyswitchbot-2.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "PySwitchbot"
-version = "2.3.0"
+version = "2.4.1"
 description = "A library to communicate with Switchbot"
 authors = ["Daniel Hjelseth Hoyer"]
 license = "MIT"
@@ -34,7 +34,7 @@ pyOpenSSL = ">=23.0.0"
 [tool.poetry.group.dev.dependencies]
 pytest = ">=7,<10"
 pytest-cov = ">=3,<8"
-pytest-asyncio = ">=0.19,<1.4"
+pytest-asyncio = ">=0.19,<1.5"
 
 [tool.semantic_release]
 branch = "main"

{pyswitchbot-2.3.0 → pyswitchbot-2.4.1}/switchbot/__init__.py

@@ -61,7 +61,7 @@ from .devices.light_strip import (
     SwitchbotStripLight3,
 )
 from .devices.lock import SwitchbotLock
-from .devices.meter_pro import SwitchbotMeterProCO2
+from .devices.meter_pro import SwitchbotMeterPro, SwitchbotMeterProCO2
 from .devices.plug import SwitchbotPlugMini
 from .devices.relay_switch import (
     SwitchbotGarageDoorOpener,
@@ -95,7 +95,6 @@ __all__ = [
     "StripLightColorMode",
     "SwitchBotAdvertisement",
     "Switchbot",
-    "Switchbot",
     "SwitchbotAccountConnectionError",
     "SwitchbotAirPurifier",
     "SwitchbotApiError",
@@ -116,13 +115,12 @@ __all__ = [
     "SwitchbotKeypadVision",
     "SwitchbotLightStrip",
     "SwitchbotLock",
+    "SwitchbotMeterPro",
     "SwitchbotMeterProCO2",
     "SwitchbotModel",
-    "SwitchbotModel",
     "SwitchbotOperationError",
     "SwitchbotPermanentOutdoorLight",
     "SwitchbotPlugMini",
-    "SwitchbotPlugMini",
     "SwitchbotRelaySwitch",
     "SwitchbotRelaySwitch2PM",
     "SwitchbotRgbicLight",
@@ -133,7 +131,6 @@ __all__ = [
     "SwitchbotStandingFan",
     "SwitchbotStripLight3",
     "SwitchbotSupportedType",
-    "SwitchbotSupportedType",
     "SwitchbotVacuum",
     "VerticalOscillationAngle",
     "close_stale_connections",

pyswitchbot-2.4.1/switchbot/__version__.py

@@ -0,0 +1 @@
+__version__ = "2.4.1"

{pyswitchbot-2.3.0 → pyswitchbot-2.4.1}/switchbot/adv_parser.py

@@ -678,6 +678,18 @@ SUPPORTED_TYPES: dict[str | bytes, SwitchbotSupportedType] = {
         "func": process_rgbic_light,
         "manufacturer_id": 2409,
     },
+    b"\x00\x11\xbe\xf8": {
+        "modelName": SwitchbotModel.RGBICWW_LIGHT_BARS,
+        "modelFriendlyName": "RGBICWW Light Bars",
+        "func": process_rgbic_light,
+        "manufacturer_id": 2409,
+    },
+    b"\x01\x11\xbe\xf8": {
+        "modelName": SwitchbotModel.RGBICWW_LIGHT_BARS,
+        "modelFriendlyName": "RGBICWW Light Bars",
+        "func": process_rgbic_light,
+        "manufacturer_id": 2409,
+    },
     b"\x00\x11\xbb\x10": {
         "modelName": SwitchbotModel.RGBICWW_CEILING_LIGHT,
         "modelFriendlyName": "RGBICWW Ceiling Light",

{pyswitchbot-2.3.0 → pyswitchbot-2.4.1}/switchbot/const/__init__.py

@@ -107,6 +107,7 @@ class SwitchbotModel(StrEnum):
     PLUG_MINI_EU = "Plug Mini (EU)"
     RGBICWW_STRIP_LIGHT = "RGBICWW Strip Light"
     RGBICWW_FLOOR_LAMP = "RGBICWW Floor Lamp"
+    RGBICWW_LIGHT_BARS = "RGBICWW Light Bars"
     RGBICWW_CEILING_LIGHT = "RGBICWW Ceiling Light"
     PERMANENT_OUTDOOR_LIGHT = "Permanent Outdoor Light"
     RGBIC_NEON_ROPE_LIGHT = "RGBIC Neon Rope Light"

{pyswitchbot-2.3.0 → pyswitchbot-2.4.1}/switchbot/const/fan.py

@@ -60,3 +60,9 @@ class VerticalOscillationAngle(Enum):
     ANGLE_30 = 30
     ANGLE_60 = 60
     ANGLE_90 = 95
+
+    @classmethod
+    def _missing_(cls, value: int) -> VerticalOscillationAngle | None:
+        if value == 90:
+            return cls.ANGLE_90
+        return None

{pyswitchbot-2.3.0 → pyswitchbot-2.4.1}/switchbot/devices/ceiling_light.py

@@ -64,7 +64,7 @@ class SwitchbotCeilingLight(SwitchbotSequenceBaseLight):
 
         return {
             "isOn": bool(_data[1] & 0b10000000),
-            "color_mode": _data[1] & 0b01000000,
+            "color_mode": (_data[1] & 0b01000000) >> 6,
             "brightness": _data[2] & 0b01111111,
             "cw": self._state["cw"],
             "firmware": _version_info[2] / 10.0,

{pyswitchbot-2.3.0 → pyswitchbot-2.4.1}/switchbot/devices/device.py

@@ -102,6 +102,7 @@ API_MODEL_TO_ENUM: dict[str, SwitchbotModel] = {
     "W1102001": SwitchbotModel.STRIP_LIGHT_3,
     "W1102003": SwitchbotModel.RGBICWW_STRIP_LIGHT,
     "W1102004": SwitchbotModel.RGBICWW_FLOOR_LAMP,
+    "W1163000": SwitchbotModel.RGBICWW_LIGHT_BARS,
     "W1162000": SwitchbotModel.RGBICWW_CEILING_LIGHT,
     "W1104000": SwitchbotModel.PLUG_MINI_EU,
     "W1128000": SwitchbotModel.SMART_THERMOSTAT_RADIATOR,

{pyswitchbot-2.3.0 → pyswitchbot-2.4.1}/switchbot/devices/fan.py

@@ -241,7 +241,11 @@ class SwitchbotStandingFan(SwitchbotFan):
     @update_after_operation
     async def set_night_light(self, state: NightLightState | int) -> bool:
         """Set night-light state (LEVEL_1, LEVEL_2, OFF)."""
-        value = NightLightState(state).value
+        state = NightLightState(state)
+        # The Standing Fan firmware ignores the OFF byte defined by
+        # NightLightState (0x03) and only turns the night light off when it
+        # receives 0x00. Map OFF -> 0x00 here; LEVEL_1/LEVEL_2 are unchanged.
+        value = 0 if state is NightLightState.OFF else state.value
         cmd = f"{COMMAND_SET_NIGHT_LIGHT}{value:02X}FFFF"
         result = await self._send_command(cmd)
         return self._check_command_result(result, 0, {1})

{pyswitchbot-2.3.0 → pyswitchbot-2.4.1}/switchbot/devices/meter_pro.py

@@ -12,8 +12,8 @@ COMMAND_SET_DEVICE_DATETIME = "57000503"
 COMMAND_SET_DISPLAY_FORMAT = "570f680505"
 
 
-class SwitchbotMeterProCO2(SwitchbotDevice):
-    """API to control Switchbot Meter Pro CO2."""
+class SwitchbotMeterPro(SwitchbotDevice):
+    """API to control Switchbot Meter Pro (and Meter Pro CO2, which shares the same datetime protocol)."""
 
     async def get_time_offset(self) -> int:
         """
@@ -170,3 +170,7 @@ class SwitchbotMeterProCO2(SwitchbotDevice):
                 f"{self.name}: Unexpected response len for {op_name}, wanted at least {min_length} (result={result.hex() if result else 'None'} rssi={self.rssi})"
             )
         return result
+
+
+class SwitchbotMeterProCO2(SwitchbotMeterPro):
+    """API to control Switchbot Meter Pro CO2."""

pyswitchbot-2.3.0/switchbot/__version__.py

@@ -1 +0,0 @@
-__version__ = "2.3.0"