PySwitchbot 2.6.0__py3-none-any.whl → 2.7.1__py3-none-any.whl

{pyswitchbot-2.6.0.dist-info → pyswitchbot-2.7.1.dist-info}/METADATA

@@ -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.dist-info → pyswitchbot-2.7.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 switchbot/__init__.py,sha256=iItr_zGA3ARTGbneIjVDyW9fi6EviVFqN2yHyvMI5wA,4332
-switchbot/__version__.py,sha256=OEib63e0yPEGlhEXyrWE1OwRnleR0cHI7KSX7oZEQLs,22
-switchbot/adv_parser.py,sha256=QKnXzuxvXgKa6qjcbQjtGbKnyyXdDQpFANcaaOK_4nE,34959
+switchbot/__version__.py,sha256=yRpSH6mBb4BJgbFlT7rt8MSjCUW17Ycx0RziLf-lQLA,22
+switchbot/adv_parser.py,sha256=O5cVtZq4IRozO7X76hIrrQCGPna78Z7YHHkbROyHWcI,35353
 switchbot/adv_parsers/__init__.py,sha256=d39GEAICA1RrQiLy1ks49x0d9a-A_yKn9Awkj5za8Uk,46
 switchbot/adv_parsers/_sensor_th.py,sha256=ze182l3_YFHJJv98_vq6qB2twlUTExkxoC1sLZL3TLs,1199
 switchbot/adv_parsers/air_purifier.py,sha256=MU24S-lGNR4kqW-olodqcleHNnkOa5bd7Vj4wYPEymQ,1535
@@ -33,7 +33,7 @@ switchbot/adv_parsers/smart_thermostat_radiator.py,sha256=feaYZL8sGfYDLXpKlIc71V
 switchbot/adv_parsers/vacuum.py,sha256=3ncf6BxE3UeC5SIIoiujYFdhDLyDjLfqjRwVqv-6Zo0,2108
 switchbot/adv_parsers/weather_station.py,sha256=HOCZ-gef7e6HrOdfzcIx12rV9XURwoCetUQuShyk1R4,1155
 switchbot/api_config.py,sha256=WSsoKkgNORkbqBZDH0U0rsEwc-etpBDTCXLSJnChsPA,263
-switchbot/const/__init__.py,sha256=UfhUkWjnEOPMqaF__K8pO-c52zQHHPIWbCOXdKxucAs,4622
+switchbot/const/__init__.py,sha256=VzZ_anvQApWqeZ85pyuXKPDLm9RfjrxYzPMNZ49BELg,4660
 switchbot/const/air_purifier.py,sha256=eKMMgArZuANoDAWUKXWu0X7DPVR6di2T7i4SfO4Kddk,379
 switchbot/const/climate.py,sha256=4Kuz1nopygRs734KAyC_IgEXmPpRLgeE9JJgyJBclQA,902
 switchbot/const/evaporative_humidifier.py,sha256=Klf-jlGovrDr6DreXEkPsQnYr6Gb9U02EtB0dM7u8Z0,831
@@ -51,7 +51,7 @@ switchbot/devices/base_light.py,sha256=WWJJdRHfvoSYMRHDSv_RCmo5D6hYoZRxQVYfsOXZ7
 switchbot/devices/blind_tilt.py,sha256=tY0JoZhyqU_6PlhjtnIaEeIG3Z-JdZKJ5Jwg_5b6xSQ,5761
 switchbot/devices/bot.py,sha256=Co2IiQa2si0WPs3HFize2CPpj5GVbMT570vMP5YWpaQ,4121
 switchbot/devices/bulb.py,sha256=ISxXck8JsBlFojLB8M5Wfip_z4o6_-VvyFbBvqK6_Bg,2313
-switchbot/devices/ceiling_light.py,sha256=DypuzNHZ2TLI-xg0BauTHo9yl8LNujXc17UeW1K-oqE,2652
+switchbot/devices/ceiling_light.py,sha256=PBG69_jsuDF5R_6Man22Kqk9ZW0nIemzAjniqfuQbLU,2820
 switchbot/devices/contact.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
 switchbot/devices/curtain.py,sha256=p3qcPWHaSA5ewPONl811hL7swFRca37Omb2LKYoAxgo,7086
 switchbot/devices/device.py,sha256=MmbnWHxlWGTHZmhnxFyQQXwe_Fo6Ce7lu36lA06o0UU,49713
@@ -61,7 +61,7 @@ switchbot/devices/humidifier.py,sha256=oqtRFMSA5ZSaKMEisg1gwHwWQeWBcEt21N5Qg-fqe
 switchbot/devices/keypad.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
 switchbot/devices/keypad_vision.py,sha256=hhkbzT_uWqGy07pcReNlfAjcU5r27O4HI45xBiPAi1M,5367
 switchbot/devices/light_strip.py,sha256=Wgq4tgsZ8RXnX6SBUetDuV58kYQHrZ5BsSq6YkswNJQ,16271
-switchbot/devices/lock.py,sha256=GNytU2mBoDFIQxHPVS_XEcydhUt2HHa_rdIHLUclGLM,11878
+switchbot/devices/lock.py,sha256=Wc4NivXFXg3ldNaI2ow5H2bJuSIC28qOQkfxaPB6hEk,12580
 switchbot/devices/meter.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
 switchbot/devices/meter_pro.py,sha256=qpi4gag9p5kmUjObMedaCYSX8CnRG88Zff8UV71t1zQ,7149
 switchbot/devices/motion.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
@@ -76,7 +76,7 @@ switchbot/enum.py,sha256=0IfWypBw2oe9lWgdRkrD_1FqqeHpakCxtwlSaUlmcPg,125
 switchbot/helpers.py,sha256=DJLvYZ4Dq0dkiGMOzfR--nSTM_8jE9QtB7t570PuGSU,2091
 switchbot/models.py,sha256=xibQOVGHC60FWWc54N6BW46vxFuJUjj6tK1Qw0_eTbI,372
 switchbot/utils.py,sha256=glU1SDBeoXuu9K46nSGvg1YVWGNAGC0bo13tJ-ccDNU,724
-pyswitchbot-2.6.0.dist-info/METADATA,sha256=yLsIT4jkB9dPgwZIKKQQTU4CaE9pg162aotUByv397A,5794
-pyswitchbot-2.6.0.dist-info/WHEEL,sha256=EGEvSphFYqXKs23-kQBeyNoJP1nrT8ZJKQoi5p5DYL8,88
-pyswitchbot-2.6.0.dist-info/licenses/LICENSE,sha256=_hdUCmoRDzki4fYDJfn-5KpG7-7p6YJ6IsbMfrTXN6Y,1078
-pyswitchbot-2.6.0.dist-info/RECORD,,
+pyswitchbot-2.7.1.dist-info/METADATA,sha256=Rg_wVLedpHizkv7sjviy2_w5jF-Y68ylS52aMDRvVKM,5818
+pyswitchbot-2.7.1.dist-info/WHEEL,sha256=EGEvSphFYqXKs23-kQBeyNoJP1nrT8ZJKQoi5p5DYL8,88
+pyswitchbot-2.7.1.dist-info/licenses/LICENSE,sha256=_hdUCmoRDzki4fYDJfn-5KpG7-7p6YJ6IsbMfrTXN6Y,1078
+pyswitchbot-2.7.1.dist-info/RECORD,,

switchbot/__version__.py

@@ -1 +1 @@
-__version__ = "2.6.0"
+__version__ = "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",

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"
 
 

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),

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,