PySwitchbot 2.6.0__tar.gz → 2.7.1__tar.gz

{pyswitchbot-2.6.0 → pyswitchbot-2.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySwitchbot
-Version: 2.6.0
+Version: 2.7.1
 Summary: A library to communicate with Switchbot
 License: MIT
 License-File: LICENSE
@@ -93,10 +93,10 @@ from switchbot.discovery import GetSwitchbotDevices
 from switchbot.devices import lock
 from switchbot.const import SwitchbotModel
 
-BLE_MAC="XX:XX:XX:XX:XX:XX" # The MAC of your lock
-KEY_ID="XX" # The key-ID of your encryption-key for your lock
-ENC_KEY="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" # The encryption-key with key-ID "XX"
-LOCK_MODEL=SwitchbotModel.LOCK_PRO # Your lock model (here we use the Lock-Pro)
+BLE_MAC = "XX:XX:XX:XX:XX:XX"  # The MAC of your lock
+KEY_ID = "XX"  # The key-ID of your encryption-key for your lock
+ENC_KEY = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"  # The encryption-key with key-ID "XX"
+LOCK_MODEL = SwitchbotModel.LOCK_PRO  # Your lock model (here we use the Lock-Pro)
 
 
 async def main():
@@ -117,10 +117,10 @@ from switchbot.discovery import GetSwitchbotDevices
 from switchbot.devices import lock
 from switchbot.const import SwitchbotModel
 
-BLE_MAC="XX:XX:XX:XX:XX:XX" # The MAC of your lock
-KEY_ID="XX" # The key-ID of your encryption-key for your lock
-ENC_KEY="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" # The encryption-key with key-ID "XX"
-LOCK_MODEL=SwitchbotModel.LOCK_PRO # Your lock model (here we use the Lock-Pro)
+BLE_MAC = "XX:XX:XX:XX:XX:XX"  # The MAC of your lock
+KEY_ID = "XX"  # The key-ID of your encryption-key for your lock
+ENC_KEY = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"  # The encryption-key with key-ID "XX"
+LOCK_MODEL = SwitchbotModel.LOCK_PRO  # Your lock model (here we use the Lock-Pro)
 
 
 async def main():

{pyswitchbot-2.6.0 → pyswitchbot-2.7.1}/README.md

@@ -62,10 +62,10 @@ from switchbot.discovery import GetSwitchbotDevices
 from switchbot.devices import lock
 from switchbot.const import SwitchbotModel
 
-BLE_MAC="XX:XX:XX:XX:XX:XX" # The MAC of your lock
-KEY_ID="XX" # The key-ID of your encryption-key for your lock
-ENC_KEY="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" # The encryption-key with key-ID "XX"
-LOCK_MODEL=SwitchbotModel.LOCK_PRO # Your lock model (here we use the Lock-Pro)
+BLE_MAC = "XX:XX:XX:XX:XX:XX"  # The MAC of your lock
+KEY_ID = "XX"  # The key-ID of your encryption-key for your lock
+ENC_KEY = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"  # The encryption-key with key-ID "XX"
+LOCK_MODEL = SwitchbotModel.LOCK_PRO  # Your lock model (here we use the Lock-Pro)
 
 
 async def main():
@@ -86,10 +86,10 @@ from switchbot.discovery import GetSwitchbotDevices
 from switchbot.devices import lock
 from switchbot.const import SwitchbotModel
 
-BLE_MAC="XX:XX:XX:XX:XX:XX" # The MAC of your lock
-KEY_ID="XX" # The key-ID of your encryption-key for your lock
-ENC_KEY="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" # The encryption-key with key-ID "XX"
-LOCK_MODEL=SwitchbotModel.LOCK_PRO # Your lock model (here we use the Lock-Pro)
+BLE_MAC = "XX:XX:XX:XX:XX:XX"  # The MAC of your lock
+KEY_ID = "XX"  # The key-ID of your encryption-key for your lock
+ENC_KEY = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"  # The encryption-key with key-ID "XX"
+LOCK_MODEL = SwitchbotModel.LOCK_PRO  # Your lock model (here we use the Lock-Pro)
 
 
 async def main():

{pyswitchbot-2.6.0 → pyswitchbot-2.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "PySwitchbot"
-version = "2.6.0"
+version = "2.7.1"
 description = "A library to communicate with Switchbot"
 authors = ["Daniel Hjelseth Hoyer"]
 license = "MIT"

pyswitchbot-2.7.1/switchbot/__version__.py

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

{pyswitchbot-2.6.0 → pyswitchbot-2.7.1}/switchbot/adv_parser.py

@@ -898,6 +898,18 @@ SUPPORTED_TYPES: dict[str | bytes, SwitchbotSupportedType] = {
         "func": process_wolock_pro,
         "manufacturer_id": 2409,
     },
+    b"\x00\x11\x9f\xb8": {
+        "modelName": SwitchbotModel.LOCK_ULTRA_MAX,
+        "modelFriendlyName": "Lock Ultra Max",
+        "func": process_lock2,
+        "manufacturer_id": 2409,
+    },
+    b"\x01\x11\x9f\xb8": {
+        "modelName": SwitchbotModel.LOCK_ULTRA_MAX,
+        "modelFriendlyName": "Lock Ultra Max",
+        "func": process_lock2,
+        "manufacturer_id": 2409,
+    },
     b"\x00\x11\x07\x60": {
         "modelName": SwitchbotModel.STANDING_FAN,
         "modelFriendlyName": "Standing Fan",

{pyswitchbot-2.6.0 → pyswitchbot-2.7.1}/switchbot/const/__init__.py

@@ -126,6 +126,7 @@ class SwitchbotModel(StrEnum):
     LOCK_VISION_PRO = "Lock Vision Pro"
     LOCK_VISION = "Lock Vision"
     LOCK_PRO_WIFI = "Lock Pro Wifi"
+    LOCK_ULTRA_MAX = "Lock Ultra Max"
     WEATHER_STATION = "Weather Station"
 
 

{pyswitchbot-2.6.0 → pyswitchbot-2.7.1}/switchbot/devices/ceiling_light.py

@@ -60,7 +60,11 @@ class SwitchbotCeilingLight(SwitchbotSequenceBaseLight):
             return None
         _version_info, _data = res
 
-        self._state["cw"] = int.from_bytes(_data[3:5], "big")
+        color_temp = int.from_bytes(_data[3:5], "big")
+        if self.min_temp <= color_temp <= self.max_temp:
+            self._state["cw"] = color_temp
+        else:
+            self._state.setdefault("cw", DEFAULT_COLOR_TEMP)
 
         return {
             "isOn": bool(_data[1] & 0b10000000),

{pyswitchbot-2.6.0 → pyswitchbot-2.7.1}/switchbot/devices/lock.py

@@ -22,6 +22,7 @@ COMMAND_LOCK_INFO = {
     SwitchbotModel.LOCK_LITE: f"{COMMAND_HEADER}0f4f8101",
     SwitchbotModel.LOCK_PRO: f"{COMMAND_HEADER}0f4f8104",
     SwitchbotModel.LOCK_ULTRA: f"{COMMAND_HEADER}0f4f8107",
+    SwitchbotModel.LOCK_ULTRA_MAX: f"{COMMAND_HEADER}0f4f8107",
     SwitchbotModel.LOCK_VISION_PRO: f"{COMMAND_HEADER}0f4f8102",
     SwitchbotModel.LOCK_VISION: f"{COMMAND_HEADER}0f4f8102",
     SwitchbotModel.LOCK_PRO_WIFI: f"{COMMAND_HEADER}0f4f810a",
@@ -31,6 +32,7 @@ COMMAND_UNLOCK = {
     SwitchbotModel.LOCK_LITE: f"{COMMAND_HEADER}0f4e01011080",
     SwitchbotModel.LOCK_PRO: f"{COMMAND_HEADER}0f4e0101000080",
     SwitchbotModel.LOCK_ULTRA: f"{COMMAND_HEADER}0f4e0101000080",
+    SwitchbotModel.LOCK_ULTRA_MAX: f"{COMMAND_HEADER}0f4e0101000080",
     SwitchbotModel.LOCK_VISION_PRO: f"{COMMAND_HEADER}0f4e0101000080",
     SwitchbotModel.LOCK_VISION: f"{COMMAND_HEADER}0f4e0101000080",
     SwitchbotModel.LOCK_PRO_WIFI: f"{COMMAND_HEADER}0f4e0101000080",
@@ -40,6 +42,7 @@ COMMAND_UNLOCK_WITHOUT_UNLATCH = {
     SwitchbotModel.LOCK_LITE: f"{COMMAND_HEADER}0f4e010110a0",
     SwitchbotModel.LOCK_PRO: f"{COMMAND_HEADER}0f4e01010000a0",
     SwitchbotModel.LOCK_ULTRA: f"{COMMAND_HEADER}0f4e01010000a0",
+    SwitchbotModel.LOCK_ULTRA_MAX: f"{COMMAND_HEADER}0f4e01010000a0",
     SwitchbotModel.LOCK_VISION_PRO: f"{COMMAND_HEADER}0f4e01010000a0",
     SwitchbotModel.LOCK_VISION: f"{COMMAND_HEADER}0f4e01010000a0",
     SwitchbotModel.LOCK_PRO_WIFI: f"{COMMAND_HEADER}0f4e01010000a0",
@@ -49,6 +52,7 @@ COMMAND_LOCK = {
     SwitchbotModel.LOCK_LITE: f"{COMMAND_HEADER}0f4e01011000",
     SwitchbotModel.LOCK_PRO: f"{COMMAND_HEADER}0f4e0101000000",
     SwitchbotModel.LOCK_ULTRA: f"{COMMAND_HEADER}0f4e0101000000",
+    SwitchbotModel.LOCK_ULTRA_MAX: f"{COMMAND_HEADER}0f4e0101000000",
     SwitchbotModel.LOCK_VISION_PRO: f"{COMMAND_HEADER}0f4e0101000000",
     SwitchbotModel.LOCK_VISION: f"{COMMAND_HEADER}0f4e0101000000",
     SwitchbotModel.LOCK_PRO_WIFI: f"{COMMAND_HEADER}0f4e0101000000",
@@ -62,6 +66,7 @@ COMMAND_ENABLE_NOTIFICATIONS = {
     SwitchbotModel.LOCK_LITE: f"{COMMAND_HEADER}0e01001e00008101",
     SwitchbotModel.LOCK_PRO: f"{COMMAND_HEADER}0e01001e00008104",
     SwitchbotModel.LOCK_ULTRA: f"{COMMAND_HEADER}0e01001e00008107",
+    SwitchbotModel.LOCK_ULTRA_MAX: f"{COMMAND_HEADER}0e01001e00008107",
     SwitchbotModel.LOCK_VISION_PRO: f"{COMMAND_HEADER}0e01001e00008102",
     SwitchbotModel.LOCK_VISION: f"{COMMAND_HEADER}0e01001e00008102",
     SwitchbotModel.LOCK_PRO_WIFI: f"{COMMAND_HEADER}0e01001e0000810a",
@@ -102,6 +107,7 @@ class SwitchbotLock(SwitchbotSequenceDevice, SwitchbotEncryptedDevice):
             SwitchbotModel.LOCK_PRO,
             SwitchbotModel.LOCK_LITE,
             SwitchbotModel.LOCK_ULTRA,
+            SwitchbotModel.LOCK_ULTRA_MAX,
             SwitchbotModel.LOCK_VISION_PRO,
             SwitchbotModel.LOCK_VISION,
             SwitchbotModel.LOCK_PRO_WIFI,
@@ -143,6 +149,11 @@ class SwitchbotLock(SwitchbotSequenceDevice, SwitchbotEncryptedDevice):
 
     def _parse_basic_data(self, basic_data: bytes) -> dict[str, Any]:
         """Parse basic data from lock."""
+        if self._model is SwitchbotModel.LOCK_ULTRA_MAX:
+            # Lock Ultra Max's basic-info response format is not documented.
+            # Its advertisement already carries the reliable battery and state
+            # data, so never overwrite that data with an unverified response.
+            return {}
         return {
             "battery": basic_data[1],
             "firmware": basic_data[2] / 10.0,

pyswitchbot-2.6.0/switchbot/__version__.py

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