PySwitchbot 2.2.0__py3-none-any.whl → 2.3.0__py3-none-any.whl

{pyswitchbot-2.2.0.dist-info → pyswitchbot-2.3.0.dist-info}/METADATA

@@ -1,35 +1,33 @@
 Metadata-Version: 2.4
 Name: PySwitchbot
-Version: 2.2.0
+Version: 2.3.0
 Summary: A library to communicate with Switchbot
-Home-page: https://github.com/sblibs/pySwitchbot/
-Author: Daniel Hjelseth Hoyer
 License: MIT
+License-File: LICENSE
+Author: Daniel Hjelseth Hoyer
+Requires-Python: >=3.11,<4.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Other Environment
 Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Home Automation
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.11
+Requires-Dist: aiohttp (>=3.9.5)
+Requires-Dist: bleak (>=0.19.0)
+Requires-Dist: bleak-retry-connector (>=3.4.0)
+Requires-Dist: cryptography (>=39.0.0)
+Requires-Dist: pyOpenSSL (>=23.0.0)
+Project-URL: Bug Tracker, https://github.com/sblibs/pySwitchbot/issues
+Project-URL: Changelog, https://github.com/sblibs/pySwitchbot/blob/main/CHANGELOG.md
+Project-URL: Repository, https://github.com/sblibs/pySwitchbot/
 Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: aiohttp>=3.9.5
-Requires-Dist: bleak>=0.19.0
-Requires-Dist: bleak-retry-connector>=3.4.0
-Requires-Dist: cryptography>=39.0.0
-Requires-Dist: pyOpenSSL>=23.0.0
-Dynamic: author
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
-Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # pySwitchbot [![codecov](https://codecov.io/gh/sblibs/pySwitchbot/graph/badge.svg?token=TI027U5ISQ)](https://codecov.io/gh/sblibs/pySwitchbot)
 
@@ -58,6 +56,31 @@ Encryption key: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 Where `MAC` is MAC address of the lock and `USERNAME` is your SwitchBot account username, after that script will ask for your password.
 If authentication succeeds then script should output your key id and encryption key.
 
+### Troubleshooting key retrieval
+
+Key retrieval talks to SwitchBot's account API with your username and
+password. The most common failures are account-side, not bugs in this library:
+
+- **`Authentication failed: ...`** — the username/password were rejected. This
+  happens when:
+  - Two-factor authentication (2FA) is enabled on the account. The API login
+    used here does not support a verification code, so 2FA accounts cannot
+    retrieve keys this way — temporarily disable 2FA, fetch the key, then
+    re-enable it.
+  - The account was created via "Sign in with Apple"/Google and has no
+    password set. Set a password in the SwitchBot app first, or use an
+    email/password account.
+  - The username is an email but the account is registered to a phone number
+    (or vice versa). Use the exact identifier you log in with.
+- **`Failed to retrieve encryption key from SwitchBot Account: ...`** —
+  authentication succeeded but the key could not be read. Usually the account
+  is not the device **owner**: keys are only returned to the owning account,
+  not to shared/family members. Retrieve the key from the owner account, or
+  transfer ownership in the app.
+
+The key only needs to be fetched once; store the `key_id` and encryption key
+and reuse them — there is no need to call the script on every connection.
+
 ## Examples:
 
 #### WoLock (Lock-Pro)
@@ -79,7 +102,7 @@ LOCK_MODEL=SwitchbotModel.LOCK_PRO # Your lock model (here we use the Lock-Pro)
 async def main():
     wolock = await GetSwitchbotDevices().get_locks()
     await lock.SwitchbotLock(
-        wolock[BLE_MAC].device, KEY_ID, ENCRYPTION_KEY, model=LOCK_MODEL
+        wolock[BLE_MAC].device, KEY_ID, ENC_KEY, model=LOCK_MODEL
     ).unlock()
 
 
@@ -103,7 +126,7 @@ LOCK_MODEL=SwitchbotModel.LOCK_PRO # Your lock model (here we use the Lock-Pro)
 async def main():
     wolock = await GetSwitchbotDevices().get_locks()
     await lock.SwitchbotLock(
-        wolock[BLE_MAC].device, KEY_ID, ENCRYPTION_KEY, model=LOCK_MODEL
+        wolock[BLE_MAC].device, KEY_ID, ENC_KEY, model=LOCK_MODEL
     ).lock()
 
 
@@ -141,3 +164,4 @@ async def main():
 if __name__ == "__main__":
     asyncio.run(main())
 ```
+

pyswitchbot-2.3.0.dist-info/RECORD

@@ -0,0 +1,81 @@
+switchbot/__init__.py,sha256=MVFn7-FcK6rEqNk6SVGSMf2bbbSxC_spupxO8d6v-Wk,4156
+switchbot/__version__.py,sha256=CpK8IH_dCUAwg9tqv7zm9FxbBFkxCnED1JUiRe7cftU,22
+switchbot/adv_parser.py,sha256=k4Mpoj7bOlstBllTZJ4ILw5fbWKncvsj8sLDZLSr18M,33635
+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
+switchbot/adv_parsers/art_frame.py,sha256=ZSLEAcwq2ZHeneAAouw2KvZqlKDXYtf6iDVuqE86Z2M,981
+switchbot/adv_parsers/blind_tilt.py,sha256=qtDALLJXhfCorpQX2vt-nLTaEg-1bcNsqzLO3w03fHY,868
+switchbot/adv_parsers/bot.py,sha256=BcdXkTlkKohR4LJiVidqaJlATjLr1VeeMKdQ0i1eDW0,654
+switchbot/adv_parsers/bulb.py,sha256=rYRARx8lSo3rLsBcpWJWCem2Kuib5wohvJIkGbEdLIE,655
+switchbot/adv_parsers/ceiling_light.py,sha256=-3p7nbfWpse19nsnl9VQG56V4ZdJmJDPrj_4diCDz4A,690
+switchbot/adv_parsers/climate_panel.py,sha256=egXGTB1t554N4RaO9bhU0LCzTCNKKemoeAa2NrxkwRE,1279
+switchbot/adv_parsers/contact.py,sha256=cQgQuOAVRtc3vvjTaOAOA74VguC3nQYeyc0CufnfENo,1475
+switchbot/adv_parsers/curtain.py,sha256=DNFnrF_uG4YPr7b7pi430ZKOrpalrQ2uwwFpl1BjCqY,1239
+switchbot/adv_parsers/fan.py,sha256=GiKBp8hIL1j6bzZkfsERRP9Bm2uTlnYK-8piRU38Kuc,2102
+switchbot/adv_parsers/hub2.py,sha256=79_onOxjPrVGFWK5d2XV-LtxMUFSQsMzcgaXk96T9a4,1587
+switchbot/adv_parsers/hub3.py,sha256=-PJacqBLazwnxPUt6luK6Dvs-sf7oJ5vax0TwTFA0tA,1905
+switchbot/adv_parsers/hubmini_matter.py,sha256=kzmb8ru-Yv537qGo53jS-vLe4Hjzb7mlmyt8oU7-MmQ,957
+switchbot/adv_parsers/humidifier.py,sha256=6CYQSEjZ4Oq2ybgT8ELa0bUqOzcTD1pBzunuGWABzjs,3109
+switchbot/adv_parsers/keypad.py,sha256=KpYn1orBaqoFTEVUoy1qk6o2FFHgP3KbeX0Dj2o0qgc,586
+switchbot/adv_parsers/keypad_vision.py,sha256=oLfLceU5a6XurrRhbY6uJTX7H8v19bVq_BN_hZvCHJ8,2359
+switchbot/adv_parsers/leak.py,sha256=UQz98zc5c4k5-wOjlNsq5cekHZh6rUQh_FwG8v1ozfg,885
+switchbot/adv_parsers/light_strip.py,sha256=uBMyP0RuMwWZ3DmafTLFGLE7W3dV-UOxNVNjntAt1i8,2150
+switchbot/adv_parsers/lock.py,sha256=UgAvADKm5ygVQBUtVoogh04LaDbT-zwIWMGJlr1bvlc,3386
+switchbot/adv_parsers/meter.py,sha256=OydW8tK8hGV9cjabfypwYfQDWP0PbPjgwVzv2_wa2A4,1325
+switchbot/adv_parsers/motion.py,sha256=v9SEkAWk1VKkMZkdNsa3FlAOVpxEXIBXiEdLzEBsJZs,1263
+switchbot/adv_parsers/plug.py,sha256=hvF0E_Zh7ALS7MRNFu_69ha2TEXzctw3LYPSK8AniDg,509
+switchbot/adv_parsers/presence_sensor.py,sha256=-shJBuB7sf7IVgsEOZvB5O8EXso8rSaXCw2k8UwmeVs,1353
+switchbot/adv_parsers/relay_switch.py,sha256=akP8XTWcu_EmVUfyMQb1wr9xHR0FEuksRR6eGqsp3EI,1836
+switchbot/adv_parsers/remote.py,sha256=21RnWzsb5Z3giJdiFQxUxTlkQ0W5oK6-EUTXaMYaybo,450
+switchbot/adv_parsers/roller_shade.py,sha256=Y1zl5NtUrNeGBweytK0FvPOrwiSEIjh4e2xhEHEcLEY,973
+switchbot/adv_parsers/smart_thermostat_radiator.py,sha256=feaYZL8sGfYDLXpKlIc71VgKTVQWYKUqSXdlOiYZ2V4,1795
+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=jeyWrsG85C2DO5i4m7W_xUnGREOmWP-43oW26pCTCEQ,4433
+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
+switchbot/const/fan.py,sha256=PbKmjNo4NHA_q-Tto3JBcNr71lzqQEWqk1zx_olN64Y,1250
+switchbot/const/hub2.py,sha256=K1nh-FMn0wxjk3s7kPir_1NMcuR0eNcmVXCiDX2t5xM,445
+switchbot/const/hub3.py,sha256=UQwk_NVimMd1aqS1LOkLrL7PTySZzcr0WYnpk3EFPFk,308
+switchbot/const/light.py,sha256=DsCua_IYYvGy23GmviSB9GkwATPGVYIe6VNF7rZt97U,817
+switchbot/const/lock.py,sha256=wKvq5uctsKpcM6gSzxPrcvmezzRhPZPd5n948I8R4n0,342
+switchbot/const/presence_sensor.py,sha256=X2oCfl0rbdd1-dSrqQFn3NDtEBXbti-87DbWq7NyN3A,135
+switchbot/devices/__init__.py,sha256=_fyzMy8qWC_2Y1BJ4hggrCP1udNqSoU6wFmfOiYpEl0,32
+switchbot/devices/air_purifier.py,sha256=JwT5HHQLvkDdFrDEKFT8sA41bM2G_DGfuOpf-74Smyw,10620
+switchbot/devices/art_frame.py,sha256=JUb7s9ZgnPxfc3K-shxuWItiMorelzldew53PwQHr4A,4361
+switchbot/devices/base_cover.py,sha256=UWNA7eGbJdY80Mu-k41xO4tnyk7FhpYaWRWihGvDM2g,4385
+switchbot/devices/base_light.py,sha256=WWJJdRHfvoSYMRHDSv_RCmo5D6hYoZRxQVYfsOXZ7K0,6590
+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=45UsGj_gPQv8tJO40UtkzOBYvE-PZovGEgOYlMGaacc,2645
+switchbot/devices/contact.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
+switchbot/devices/curtain.py,sha256=p3qcPWHaSA5ewPONl811hL7swFRca37Omb2LKYoAxgo,7086
+switchbot/devices/device.py,sha256=k0owlB-_bslNp5yJv4swm-HJ4_YlvKLnfxJCLTnoaIA,49533
+switchbot/devices/evaporative_humidifier.py,sha256=Dmpg4oCp02iPBz6gc7z5nobio5rDyLoSLP3Oil6sRJ4,8279
+switchbot/devices/fan.py,sha256=t1PeCF91o1p5FSMXnQYOvZX38_CGsyPaOPguExkDORc,12879
+switchbot/devices/humidifier.py,sha256=oqtRFMSA5ZSaKMEisg1gwHwWQeWBcEt21N5Qg-fqeTc,3433
+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/meter.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
+switchbot/devices/meter_pro.py,sha256=tUprQ_9MEhJCFGBu1UFrQzndaM5yVFbuQBItboNrULA,6996
+switchbot/devices/motion.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
+switchbot/devices/plug.py,sha256=RqOppC3KmjROxukHFLNttEhDg7-hH_IaiTCfXWXwF_k,1397
+switchbot/devices/relay_switch.py,sha256=FH5pAskYIpsclmKXBaSHsjXzyGtsn3WxEt_GZU6FvFU,10525
+switchbot/devices/roller_shade.py,sha256=Lv3DDUgnlxArJY6qQc9HXxJwd7NcPEYmQvWnWn_yWdE,6431
+switchbot/devices/smart_thermostat_radiator.py,sha256=iSdPfns5bsRXs_iYUGmdOSH2NhirCb12p0Zv7OfV71U,6955
+switchbot/devices/vacuum.py,sha256=qzeEaXPNIs8B-FyH7NLnAqXSxd5dB7ioq6tSiajF-LM,2287
+switchbot/discovery.py,sha256=5GZrKkQe1JfDCitM_74YDljUnBGYwjErAZFdT4v969I,6364
+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.3.0.dist-info/METADATA,sha256=WDn-qiFAGbd4RlLsSB2AF491TCsh1NRQBn9lwLfSHjY,5794
+pyswitchbot-2.3.0.dist-info/WHEEL,sha256=EGEvSphFYqXKs23-kQBeyNoJP1nrT8ZJKQoi5p5DYL8,88
+pyswitchbot-2.3.0.dist-info/licenses/LICENSE,sha256=_hdUCmoRDzki4fYDJfn-5KpG7-7p6YJ6IsbMfrTXN6Y,1078
+pyswitchbot-2.3.0.dist-info/RECORD,,

{pyswitchbot-2.2.0.dist-info → pyswitchbot-2.3.0.dist-info}/WHEEL

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.1)
+Generator: poetry-core 2.4.0
 Root-Is-Purelib: true
 Tag: py3-none-any
-

switchbot/__init__.py

@@ -57,6 +57,7 @@ from .devices.light_strip import (
     SwitchbotPermanentOutdoorLight,
     SwitchbotRgbicLight,
     SwitchbotRgbicNeonLight,
+    SwitchbotRgbicwwCeilingLight,
     SwitchbotStripLight3,
 )
 from .devices.lock import SwitchbotLock
@@ -126,6 +127,7 @@ __all__ = [
     "SwitchbotRelaySwitch2PM",
     "SwitchbotRgbicLight",
     "SwitchbotRgbicNeonLight",
+    "SwitchbotRgbicwwCeilingLight",
     "SwitchbotRollerShade",
     "SwitchbotSmartThermostatRadiator",
     "SwitchbotStandingFan",

switchbot/__version__.py

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

switchbot/adv_parser.py

@@ -32,6 +32,7 @@ from .adv_parsers.light_strip import (
     process_candle_warmer_lamp,
     process_light,
     process_rgbic_light,
+    process_rgbicww_ceiling_light,
     process_wostrip,
 )
 from .adv_parsers.lock import (
@@ -677,6 +678,18 @@ SUPPORTED_TYPES: dict[str | bytes, SwitchbotSupportedType] = {
         "func": process_rgbic_light,
         "manufacturer_id": 2409,
     },
+    b"\x00\x11\xbb\x10": {
+        "modelName": SwitchbotModel.RGBICWW_CEILING_LIGHT,
+        "modelFriendlyName": "RGBICWW Ceiling Light",
+        "func": process_rgbicww_ceiling_light,
+        "manufacturer_id": 2409,
+    },
+    b"\x01\x11\xbb\x10": {
+        "modelName": SwitchbotModel.RGBICWW_CEILING_LIGHT,
+        "modelFriendlyName": "RGBICWW Ceiling Light",
+        "func": process_rgbicww_ceiling_light,
+        "manufacturer_id": 2409,
+    },
     b"\x00\x10\xd0\xb7": {
         "modelName": SwitchbotModel.PERMANENT_OUTDOOR_LIGHT,
         "modelFriendlyName": "Permanent Outdoor Light",

switchbot/adv_parsers/air_purifier.py

@@ -11,7 +11,7 @@ def process_air_purifier(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int]:
     """Process air purifier services data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 14:
         return {}
     device_data = mfr_data[6:]
 

switchbot/adv_parsers/art_frame.py

@@ -9,7 +9,7 @@ def process_art_frame(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int | str]:
     """Process Art Frame data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 10:
         return {}
 
     _seq_num = mfr_data[6]

switchbot/adv_parsers/blind_tilt.py

@@ -7,7 +7,7 @@ def process_woblindtilt(
     data: bytes | None, mfr_data: bytes | None, reverse: bool = False
 ) -> dict[str, bool | int]:
     """Process woBlindTilt services data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 10:
         return {}
 
     device_data = mfr_data[6:]
@@ -19,7 +19,7 @@ def process_woblindtilt(
 
     return {
         "calibration": _calibrated,
-        "battery": data[2] & 0b01111111 if data else None,
+        "battery": data[2] & 0b01111111 if data and len(data) >= 3 else None,
         "inMotion": _in_motion,
         "tilt": (100 - _tilt) if reverse else _tilt,
         "lightLevel": _light_level,

switchbot/adv_parsers/bot.py

@@ -8,7 +8,7 @@ def process_wohand(data: bytes | None, mfr_data: bytes | None) -> dict[str, bool
     if data is None and mfr_data is None:
         return {}
 
-    if data is None:
+    if data is None or len(data) < 3:
         return {
             "switchMode": None,
             "isOn": None,

switchbot/adv_parsers/bulb.py

@@ -7,7 +7,7 @@ def process_color_bulb(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int]:
     """Process WoBulb services data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 11:
         return {}
     return {
         "sequence_number": mfr_data[6],

switchbot/adv_parsers/ceiling_light.py

@@ -15,7 +15,7 @@ _LOGGER = logging.getLogger(__name__)
 
 def process_woceiling(data: bytes, mfr_data: bytes | None) -> dict[str, bool | int]:
     """Process WoCeiling services data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 11:
         return {}
     return {
         "sequence_number": mfr_data[6],

switchbot/adv_parsers/climate_panel.py

@@ -9,7 +9,7 @@ def process_climate_panel(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int | str]:
     """Process Climate Panel data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 16:
         return {}
 
     seq_number = mfr_data[6]

switchbot/adv_parsers/contact.py

@@ -10,10 +10,15 @@ def process_wocontact(
     if data is None and mfr_data is None:
         return {}
 
-    battery = data[2] & 0b01111111 if data else None
-    tested = bool(data[1] & 0b10000000) if data else None
+    has_full_mfr = mfr_data is not None and len(mfr_data) >= 13
+    has_full_data = data is not None and len(data) >= 9
+    if not has_full_mfr and not has_full_data:
+        return {}
+
+    battery = data[2] & 0b01111111 if data and len(data) >= 3 else None
+    tested = bool(data[1] & 0b10000000) if data and len(data) >= 2 else None
 
-    if mfr_data and len(mfr_data) >= 13:
+    if has_full_mfr:
         motion_detected = bool(mfr_data[7] & 0b10000000)
         contact_open = bool(mfr_data[7] & 0b00010000)
         contact_timeout = bool(mfr_data[7] & 0b00100000)

switchbot/adv_parsers/curtain.py

@@ -12,8 +12,8 @@ def process_wocurtain(
         battery_data = mfr_data[12]
     elif mfr_data and len(mfr_data) >= 11:
         device_data = mfr_data[8:11]
-        battery_data = data[2] if data else None
-    elif data:
+        battery_data = data[2] if data and len(data) >= 3 else None
+    elif data and len(data) >= 6:
         device_data = data[3:6]
         battery_data = data[2]
     else:
@@ -25,7 +25,7 @@ def process_wocurtain(
     _device_chain = device_data[1] & 0b00000111
 
     return {
-        "calibration": bool(data[1] & 0b01000000) if data else None,
+        "calibration": bool(data[1] & 0b01000000) if data and len(data) >= 2 else None,
         "battery": battery_data & 0b01111111 if battery_data is not None else None,
         "inMotion": _in_motion,
         "position": (100 - _position) if reverse else _position,

switchbot/adv_parsers/fan.py

@@ -11,10 +11,13 @@ _STANDING_FAN_MODE_MAP: dict[int, str] = {
 
 
 def _parse_fan(
-    mfr_data: bytes | None, mode_map: dict[int, str]
+    mfr_data: bytes | None,
+    mode_map: dict[int, str],
+    *,
+    with_charging: bool = False,
 ) -> dict[str, bool | int | str | None]:
     """Shared fan advertisement parse, parameterized on the mode map."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 10:
         return {}
 
     device_data = mfr_data[6:]
@@ -28,7 +31,7 @@ def _parse_fan(
     _battery = device_data[2] & 0b01111111
     _speed = device_data[3] & 0b01111111
 
-    return {
+    result: dict[str, bool | int | str | None] = {
         "sequence_number": _seq_num,
         "isOn": _isOn,
         "mode": mode_map.get(_mode),
@@ -39,6 +42,10 @@ def _parse_fan(
         "battery": _battery,
         "speed": _speed,
     }
+    if with_charging:
+        # Bit 7 of the battery byte is the charging flag (Standing Fan only).
+        result["charging"] = bool(device_data[2] & 0b10000000)
+    return result
 
 
 def process_fan(
@@ -52,4 +59,4 @@ def process_standing_fan(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int | str | None]:
     """Process Standing Fan services data (modes 1-5; adds CUSTOM_NATURAL)."""
-    return _parse_fan(mfr_data, _STANDING_FAN_MODE_MAP)
+    return _parse_fan(mfr_data, _STANDING_FAN_MODE_MAP, with_charging=True)

switchbot/adv_parsers/hub2.py

@@ -12,7 +12,7 @@ def process_wohub2(data: bytes | None, mfr_data: bytes | None) -> dict[str, Any]
     """Process woHub2 sensor manufacturer data."""
     temp_data = None
 
-    if mfr_data:
+    if mfr_data and len(mfr_data) >= 16:
         status = mfr_data[12]
         temp_data = mfr_data[13:16]
 

switchbot/adv_parsers/hub3.py

@@ -10,7 +10,7 @@ from ..helpers import celsius_to_fahrenheit
 
 def process_hub3(data: bytes | None, mfr_data: bytes | None) -> dict[str, Any]:
     """Process hub3 sensor manufacturer data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 17:
         return {}
     device_data = mfr_data[6:]
 

switchbot/adv_parsers/hubmini_matter.py

@@ -13,7 +13,7 @@ def process_hubmini_matter(
     """Process Hubmini matter sensor manufacturer data."""
     temp_data = None
 
-    if mfr_data:
+    if mfr_data and len(mfr_data) >= 16:
         temp_data = mfr_data[13:16]
 
     if not temp_data:

switchbot/adv_parsers/humidifier.py

@@ -46,7 +46,7 @@ def process_wohumidifier(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int]:
     """Process WoHumi services data."""
-    if data is None:
+    if data is None or len(data) < 5:
         return {
             "isOn": None,
             "level": None,
@@ -64,7 +64,7 @@ def process_evaporative_humidifier(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int]:
     """Process WoHumi services data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 17:
         return {}
 
     seq_number = mfr_data[6]

switchbot/adv_parsers/keypad.py

@@ -12,7 +12,7 @@ def process_wokeypad(
     mfr_data: bytes | None,
 ) -> dict[str, bool | int | None]:
     """Process woKeypad services data."""
-    if data is None or mfr_data is None:
+    if data is None or mfr_data is None or len(data) < 3 or len(mfr_data) < 7:
         return {"battery": None, "attempt_state": None}
 
     _LOGGER.debug("mfr_data: %s", mfr_data.hex())

switchbot/adv_parsers/keypad_vision.py

@@ -7,7 +7,7 @@ _LOGGER = logging.getLogger(__name__)
 
 def process_common_mfr_data(mfr_data: bytes | None) -> dict[str, bool | int]:
     """Process common Keypad Vision (Pro) manufacturer data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 13:
         return {}
 
     sequence_number = mfr_data[6]
@@ -41,7 +41,7 @@ def process_keypad_vision(
     """Process Keypad Vision data."""
     result = process_common_mfr_data(mfr_data)
 
-    if not result:
+    if not result or len(mfr_data) < 14:
         return {}
 
     pir_triggered_level = mfr_data[13] & 0x03
@@ -63,7 +63,7 @@ def process_keypad_vision_pro(
     """Process Keypad Vision Pro data."""
     result = process_common_mfr_data(mfr_data)
 
-    if not result:
+    if not result or len(mfr_data) < 14:
         return {}
 
     radar_triggered_level = mfr_data[13] & 0x03

switchbot/adv_parsers/leak.py

@@ -3,7 +3,7 @@
 
 def process_leak(data: bytes | None, mfr_data: bytes | None) -> dict[str, bool | int]:
     """Process SwitchBot Water Leak Detector advertisement data."""
-    if data is None or len(data) < 3 or mfr_data is None or len(mfr_data) < 2:
+    if mfr_data is None or len(mfr_data) < 9:
         return {}
 
     water_leak_detected = None

switchbot/adv_parsers/light_strip.py

@@ -9,7 +9,7 @@ def process_wostrip(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int]:
     """Process WoStrip services data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 9:
         return {}
     return {
         "sequence_number": mfr_data[6],
@@ -25,7 +25,7 @@ def process_candle_warmer_lamp(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int]:
     """Process Candle Warmer Lamp services data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 9:
         return {}
     return {
         "sequence_number": mfr_data[6],
@@ -41,7 +41,7 @@ def process_light(
 ) -> dict[str, bool | int]:
     """Support for strip light 3 and floor lamp."""
     common_data = process_wostrip(data, mfr_data)
-    if not common_data:
+    if not common_data or len(mfr_data) < cw_offset + 2:
         return {}
 
     light_data = {"cw": _UNPACK_UINT16_BE(mfr_data, cw_offset)[0]}
@@ -54,3 +54,16 @@ def process_rgbic_light(
 ) -> dict[str, bool | int]:
     """Support for RGBIC lights."""
     return process_light(data, mfr_data, cw_offset=10)
+
+
+def process_rgbicww_ceiling_light(
+    data: bytes | None, mfr_data: bytes | None
+) -> dict[str, bool | int]:
+    """Support for RGBICWW Ceiling Light (white + color sub-lights)."""
+    common_data = process_light(data, mfr_data, cw_offset=10)
+    if not common_data or len(mfr_data) < 14:
+        return {}
+    return common_data | {
+        "main_isOn": bool(mfr_data[13] & 0b10000000),
+        "main_brightness": mfr_data[13] & 0b01111111,
+    }

switchbot/adv_parsers/lock.py

@@ -12,7 +12,7 @@ _LOGGER = logging.getLogger(__name__)
 def process_wolock(data: bytes | None, mfr_data: bytes | None) -> dict[str, bool | int]:
     """Support for lock and lock lite process data."""
     common_data = process_locklite(data, mfr_data)
-    if not common_data:
+    if not common_data or len(mfr_data) < 9:
         return {}
 
     common_data["door_open"] = bool(mfr_data[7] & 0b00000100)
@@ -26,7 +26,7 @@ def process_locklite(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int]:
     """Support for lock lite process data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 9:
         return {}
 
     _LOGGER.debug("mfr_data: %s", mfr_data.hex())
@@ -35,7 +35,7 @@ def process_locklite(
 
     return {
         "sequence_number": mfr_data[6],
-        "battery": data[2] & 0b01111111 if data else None,
+        "battery": data[2] & 0b01111111 if data and len(data) >= 3 else None,
         "calibration": bool(mfr_data[7] & 0b10000000),
         "status": LockStatus((mfr_data[7] & 0b01110000) >> 4),
         "update_from_secondary_lock": bool(mfr_data[7] & 0b00001000),
@@ -46,7 +46,7 @@ def process_locklite(
 
 
 def parse_common_data(mfr_data: bytes | None) -> dict[str, bool | int]:
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 12:
         return {}
 
     _LOGGER.debug("mfr_data: %s", mfr_data.hex())

switchbot/adv_parsers/meter.py

@@ -9,17 +9,21 @@ from ._sensor_th import decode_temp_humidity
 
 CO2_UNPACK = struct.Struct(">H").unpack_from
 
+# Meter Pro CO2 sensor spec range is 400-9999 ppm. Higher values are
+# transient parsing artifacts and surface as huge spikes downstream.
+CO2_MAX_PPM = 9999
+
 
 def process_wosensorth(data: bytes | None, mfr_data: bytes | None) -> dict[str, Any]:
     """Process woSensorTH/Temp sensor services data."""
     temp_data: bytes | None = None
     battery: int | None = None
 
-    if mfr_data:
+    if mfr_data and len(mfr_data) >= 11:
         temp_data = mfr_data[8:11]
 
-    if data:
-        if not temp_data:
+    if data and len(data) >= 3:
+        if not temp_data and len(data) >= 6:
             temp_data = data[3:6]
         battery = data[2] & 0b01111111
 
@@ -34,5 +38,7 @@ def process_wosensorth_c(data: bytes | None, mfr_data: bytes | None) -> dict[str
     _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]
+        co2 = CO2_UNPACK(co2_data)[0]
+        if co2 <= CO2_MAX_PPM:
+            _wosensorth_data["co2"] = co2
     return _wosensorth_data

switchbot/adv_parsers/motion.py

@@ -16,8 +16,9 @@ def process_wopresence(
     sense_distance = None
     light_intensity = None
     is_light = None
+    motion_detected = None
 
-    if data:
+    if data and len(data) >= 6:
         tested = bool(data[1] & 0b10000000)
         motion_detected = bool(data[1] & 0b01000000)
         battery = data[2] & 0b01111111

switchbot/adv_parsers/plug.py

@@ -9,7 +9,7 @@ def process_woplugmini(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int]:
     """Process plug mini."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 12:
         return {}
     return {
         "switchMode": True,

switchbot/adv_parsers/presence_sensor.py

@@ -13,7 +13,7 @@ def process_presence_sensor(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int | str]:
     """Process Presence Sensor data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 12:
         return {}
 
     seq_number = mfr_data[6]

switchbot/adv_parsers/remote.py

@@ -11,7 +11,7 @@ def process_woremote(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, int | None]:
     """Process WoRemote adv data."""
-    if data is None:
+    if data is None or len(data) < 3:
         return {
             "battery": None,
         }

switchbot/adv_parsers/roller_shade.py

@@ -7,7 +7,7 @@ def process_worollershade(
     data: bytes | None, mfr_data: bytes | None, reverse: bool = True
 ) -> dict[str, bool | int]:
     """Process woRollerShade services data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 10:
         return {}
 
     device_data = mfr_data[6:]
@@ -20,7 +20,7 @@ def process_worollershade(
 
     return {
         "calibration": _calibrated,
-        "battery": data[2] & 0b01111111 if data else None,
+        "battery": data[2] & 0b01111111 if data and len(data) >= 3 else None,
         "inMotion": _in_motion,
         "position": (100 - _position) if reverse else _position,
         "lightLevel": _light_level,

switchbot/adv_parsers/smart_thermostat_radiator.py

@@ -11,7 +11,7 @@ def process_smart_thermostat_radiator(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int | str]:
     """Process Smart Thermostat Radiator data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 13:
         return {}
 
     _seq_num = mfr_data[6]

switchbot/adv_parsers/vacuum.py

@@ -12,7 +12,7 @@ def process_vacuum(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int | str]:
     """Support for s10, k10+ pro combo, k20 process service data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 14:
         return {}
 
     _seq_num = mfr_data[6]
@@ -48,7 +48,7 @@ def process_vacuum_k(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int | str]:
     """Support for k10+, k10+ pro process service data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 9:
         return {}
 
     _seq_num = mfr_data[6]

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_CEILING_LIGHT = "RGBICWW Ceiling Light"
     PERMANENT_OUTDOOR_LIGHT = "Permanent Outdoor Light"
     RGBIC_NEON_ROPE_LIGHT = "RGBIC Neon Rope Light"
     RGBIC_NEON_WIRE_ROPE_LIGHT = "RGBIC Neon Wire Rope Light"

switchbot/const/light.py

@@ -43,4 +43,15 @@ class RGBICStripLightColorMode(Enum):
     UNKNOWN = 10
 
 
+class RGBICWWCeilingLightColorMode(Enum):
+    SEGMENTED = 1
+    COLOR = 2
+    SCENE = 3
+    MUSIC = 4
+    CONTROLLER = 5
+    WARMWHITE = 6
+    EFFECT = 7
+    UNKNOWN = 10
+
+
 DEFAULT_COLOR_TEMP = 4001

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,
+    "W1162000": SwitchbotModel.RGBICWW_CEILING_LIGHT,
     "W1104000": SwitchbotModel.PLUG_MINI_EU,
     "W1128000": SwitchbotModel.SMART_THERMOSTAT_RADIATOR,
     "W1111000": SwitchbotModel.CLIMATE_PANEL,
@@ -850,8 +851,8 @@ class SwitchbotBaseDevice:
         Returns true if data has changed and False if not.
         """
         if not self._sb_adv_data:
-            _LOGGER.exception("No advertisement data to update")
-            return None
+            _LOGGER.debug("%s: No advertisement data to update", self.name)
+            return False
         old_data = self._sb_adv_data.data.get("data") or {}
         merged_data = _merge_data(old_data, new_data)
         if merged_data == old_data:

switchbot/devices/fan.py

@@ -37,6 +37,11 @@ COMMAND_START_OSCILLATION_ALL_AXES = f"{COMMAND_HEAD}02010101"
 COMMAND_STOP_OSCILLATION_ALL_AXES = f"{COMMAND_HEAD}02010202"
 COMMAND_SET_OSCILLATION_PARAMS = f"{COMMAND_HEAD}0202"  # +angles
 COMMAND_SET_NIGHT_LIGHT = f"{COMMAND_HEAD}0502"  # +state
+# Standing Fan (FAN2) extra controls.
+COMMAND_SET_DISPLAY_LIGHT = f"{COMMAND_HEAD}0501"  # +state + FFFF (front LED display)
+COMMAND_SET_SOUND = f"{COMMAND_HEAD}0601"  # +level (64 on / 00 off)
+COMMAND_SET_AUTO_RECENTER = f"{COMMAND_HEAD}0205"  # +both axes (0101 on / 0202 off)
+COMMAND_SET_CHILD_LOCK = f"{COMMAND_HEAD}07"  # +state (01 on / 02 off)
 COMMAND_SET_MODE = {
     FanMode.NORMAL.name.lower(): f"{COMMAND_HEAD}030101ff",
     FanMode.NATURAL.name.lower(): f"{COMMAND_HEAD}030102ff",
@@ -69,6 +74,10 @@ class SwitchbotFan(SwitchbotSequenceDevice):
             return None
 
         _LOGGER.debug("data: %s", _data)
+        return self._parse_basic_info(_data, _data1)
+
+    def _parse_basic_info(self, _data: bytes, _data1: bytes) -> dict[str, Any]:
+        """Decode the basic-info connection response into a state dict."""
         battery = _data[2] & 0b01111111
         isOn = bool(_data[3] & 0b10000000)
         oscillating_horizontal = bool(_data[3] & 0b01000000)
@@ -186,6 +195,22 @@ class SwitchbotStandingFan(SwitchbotFan):
     _command_start_oscillation: ClassVar[str] = COMMAND_START_OSCILLATION_ALL_AXES
     _command_stop_oscillation: ClassVar[str] = COMMAND_STOP_OSCILLATION_ALL_AXES
 
+    def _parse_basic_info(self, _data: bytes, _data1: bytes) -> dict[str, Any]:
+        """Add the Standing-Fan-only fields to the basic-info response."""
+        info = super()._parse_basic_info(_data, _data1)
+        # Sweep angle as the raw device byte: horizontal is the angle in degrees
+        # (30/60/90); vertical encodes 90 as 95 (see VerticalOscillationAngle).
+        info["oscillating_horizontal_angle"] = _data[4]
+        info["oscillating_vertical_angle"] = _data[6]
+        info["charging"] = bool(_data[2] & 0b10000000)
+        info["child_lock"] = bool(_data[3] & 0b00000001)
+        info["display"] = bool(_data[3] & 0b00000010)
+        # bit 4 = horizontal axis, bit 3 = vertical; the app toggles both at once.
+        info["auto_recenter"] = bool(_data[3] & 0b00011000)
+        if len(_data) > 10:
+            info["sound"] = bool(_data[10] & 0b01111111)
+        return info
+
     @update_after_operation
     async def set_horizontal_oscillation_angle(
         self, angle: HorizontalOscillationAngle | int
@@ -204,7 +229,7 @@ class SwitchbotStandingFan(SwitchbotFan):
         Set vertical oscillation angle (30 / 60 / 90 degrees).
 
         The device uses a different byte encoding on the vertical axis than
-        on the horizontal one — 90° maps to byte 0x5F (95), not 0x5A (90),
+        on the horizontal one: 90° maps to byte 0x5F (95), not 0x5A (90),
         which the firmware interprets as an axis halt. Use
         `VerticalOscillationAngle` (or the raw byte values 30 / 60 / 95).
         """
@@ -221,6 +246,62 @@ class SwitchbotStandingFan(SwitchbotFan):
         result = await self._send_command(cmd)
         return self._check_command_result(result, 0, {1})
 
+    @update_after_operation
+    async def set_child_lock(self, enabled: bool) -> bool:
+        """Enable or disable the child lock."""
+        cmd = f"{COMMAND_SET_CHILD_LOCK}{'01' if enabled else '02'}"
+        result = await self._send_command(cmd)
+        return self._check_command_result(result, 0, {1})
+
+    @update_after_operation
+    async def set_display(self, enabled: bool) -> bool:
+        """Turn the front display (LED) on or off."""
+        cmd = f"{COMMAND_SET_DISPLAY_LIGHT}{'01' if enabled else '02'}FFFF"
+        result = await self._send_command(cmd)
+        return self._check_command_result(result, 0, {1})
+
+    @update_after_operation
+    async def set_sound(self, enabled: bool) -> bool:
+        """Turn the key tone (buzzer) on or off."""
+        cmd = f"{COMMAND_SET_SOUND}{'64' if enabled else '00'}"
+        result = await self._send_command(cmd)
+        return self._check_command_result(result, 0, {1})
+
+    @update_after_operation
+    async def set_auto_recenter(self, enabled: bool) -> bool:
+        """Enable or disable auto return-to-center on both axes."""
+        cmd = f"{COMMAND_SET_AUTO_RECENTER}{'0101' if enabled else '0202'}"
+        result = await self._send_command(cmd)
+        return self._check_command_result(result, 0, {1})
+
+    def get_horizontal_oscillation_angle(self) -> int | None:
+        """Return cached horizontal oscillation angle (raw device byte)."""
+        return self._get_adv_value("oscillating_horizontal_angle")
+
+    def get_vertical_oscillation_angle(self) -> int | None:
+        """Return cached vertical oscillation angle (raw device byte; 90° = 95)."""
+        return self._get_adv_value("oscillating_vertical_angle")
+
     def get_night_light_state(self) -> int | None:
         """Return cached night light state."""
         return self._get_adv_value("nightLight")
+
+    def is_charging(self) -> bool | None:
+        """Return cached charging state."""
+        return self._get_adv_value("charging")
+
+    def get_child_lock(self) -> bool | None:
+        """Return cached child-lock state."""
+        return self._get_adv_value("child_lock")
+
+    def get_display(self) -> bool | None:
+        """Return cached front-display (LED) state."""
+        return self._get_adv_value("display")
+
+    def get_sound(self) -> bool | None:
+        """Return cached key-tone (buzzer) state."""
+        return self._get_adv_value("sound")
+
+    def get_auto_recenter(self) -> bool | None:
+        """Return cached auto-recenter (return-to-center) state."""
+        return self._get_adv_value("auto_recenter")

switchbot/devices/light_strip.py

@@ -3,9 +3,14 @@ from __future__ import annotations
 from typing import Any
 
 from ..const import SwitchbotModel
-from ..const.light import ColorMode, RGBICStripLightColorMode, StripLightColorMode
+from ..const.light import (
+    ColorMode,
+    RGBICStripLightColorMode,
+    RGBICWWCeilingLightColorMode,
+    StripLightColorMode,
+)
 from .base_light import SwitchbotSequenceBaseLight
-from .device import SwitchbotEncryptedDevice
+from .device import SwitchbotEncryptedDevice, update_after_operation
 
 # Private mapping from device-specific color modes to original ColorMode enum
 _STRIP_LIGHT_COLOR_MODE_MAP = {
@@ -26,6 +31,16 @@ _RGBICWW_STRIP_LIGHT_COLOR_MODE_MAP = {
     RGBICStripLightColorMode.EFFECT: ColorMode.EFFECT,
     RGBICStripLightColorMode.UNKNOWN: ColorMode.OFF,
 }
+_RGBICWW_CEILING_LIGHT_COLOR_MODE_MAP = {
+    RGBICWWCeilingLightColorMode.SEGMENTED: ColorMode.EFFECT,
+    RGBICWWCeilingLightColorMode.COLOR: ColorMode.RGB,
+    RGBICWWCeilingLightColorMode.SCENE: ColorMode.EFFECT,
+    RGBICWWCeilingLightColorMode.MUSIC: ColorMode.EFFECT,
+    RGBICWWCeilingLightColorMode.CONTROLLER: ColorMode.EFFECT,
+    RGBICWWCeilingLightColorMode.WARMWHITE: ColorMode.COLOR_TEMP,
+    RGBICWWCeilingLightColorMode.EFFECT: ColorMode.EFFECT,
+    RGBICWWCeilingLightColorMode.UNKNOWN: ColorMode.OFF,
+}
 LIGHT_STRIP_CONTROL_HEADER = "570F4901"
 COMMON_EFFECTS = {
     "christmas": [
@@ -352,3 +367,124 @@ class SwitchbotRgbicNeonLight(SwitchbotEncryptedDevice, SwitchbotLightStrip):
     def color_mode(self) -> ColorMode:
         """Return the current color mode."""
         return ColorMode.RGB
+
+
+class SwitchbotRgbicwwCeilingLight(SwitchbotEncryptedDevice, SwitchbotLightStrip):
+    """Support for Switchbot RGBICWW Ceiling Light (warm-white + color sub-lights)."""
+
+    _model = SwitchbotModel.RGBICWW_CEILING_LIGHT
+    _effect_dict = RGBIC_EFFECTS
+
+    # Color sub-light commands (sub_cmd 0x12 brightness+RGB, 0x14 brightness)
+    _set_brightness_command = f"{LIGHT_STRIP_CONTROL_HEADER}14{{}}"
+    _set_rgb_command = f"{LIGHT_STRIP_CONTROL_HEADER}12{{}}"
+
+    # Main (warm-white) sub-light commands (sub_cmd 0x09, 0x10, 0x11)
+    _set_main_brightness_command = f"{LIGHT_STRIP_CONTROL_HEADER}09{{}}"
+    _set_main_color_temp_command = f"{LIGHT_STRIP_CONTROL_HEADER}10{{}}"
+    _set_color_temp_command = f"{LIGHT_STRIP_CONTROL_HEADER}11{{}}"
+
+    # Sub-light power control: 0x49 0x01 <onoff> <selector>.
+    # onoff = 0x01 (on)/0x02 (off)/0x03 (toggle); here we always send 0x01 and
+    # let the selector drive the individual sub-lights.
+    # selector: bit7=1 (specify), bits[3:2]=color state, bits[1:0]=white state;
+    # state encoding 00=keep, 01=on, 02=off, 03=toggle.
+    _turn_on_main_command = f"{LIGHT_STRIP_CONTROL_HEADER}0181"
+    _turn_off_main_command = f"{LIGHT_STRIP_CONTROL_HEADER}0182"
+    _turn_on_color_command = f"{LIGHT_STRIP_CONTROL_HEADER}0184"
+    _turn_off_color_command = f"{LIGHT_STRIP_CONTROL_HEADER}0188"
+
+    @property
+    def color_modes(self) -> set[ColorMode]:
+        """Return the supported color modes (color sub-light)."""
+        return {ColorMode.RGB, ColorMode.COLOR_TEMP}
+
+    @property
+    def color_mode(self) -> ColorMode:
+        """Return the current color mode."""
+        device_mode = RGBICWWCeilingLightColorMode(
+            self._get_adv_value("color_mode") or 10
+        )
+        return _RGBICWW_CEILING_LIGHT_COLOR_MODE_MAP.get(device_mode, ColorMode.OFF)
+
+    @property
+    def is_main_on(self) -> bool | None:
+        """Return whether the main (warm-white) sub-light is on."""
+        return self._get_adv_value("main_isOn")
+
+    @property
+    def main_brightness(self) -> int:
+        """Return the main (warm-white) sub-light brightness 0-100."""
+        return self._get_adv_value("main_brightness") or 0
+
+    @update_after_operation
+    async def turn_on_main(self) -> bool:
+        """Turn the main (warm-white) sub-light on."""
+        result = await self._send_command(self._turn_on_main_command)
+        return self._check_command_result(result, 0, {1})
+
+    @update_after_operation
+    async def turn_off_main(self) -> bool:
+        """Turn the main (warm-white) sub-light off."""
+        result = await self._send_command(self._turn_off_main_command)
+        return self._check_command_result(result, 0, {1})
+
+    @update_after_operation
+    async def turn_on_color(self) -> bool:
+        """Turn the color sub-light on."""
+        result = await self._send_command(self._turn_on_color_command)
+        return self._check_command_result(result, 0, {1})
+
+    @update_after_operation
+    async def turn_off_color(self) -> bool:
+        """Turn the color sub-light off."""
+        result = await self._send_command(self._turn_off_color_command)
+        return self._check_command_result(result, 0, {1})
+
+    @update_after_operation
+    async def set_main_brightness(self, brightness: int) -> bool:
+        """Set the main (warm-white) sub-light brightness (sub_cmd 0x09)."""
+        self._validate_brightness(brightness)
+        hex_brightness = f"{brightness:02X}"
+        result = await self._send_command(
+            self._set_main_brightness_command.format(hex_brightness)
+        )
+        return self._check_command_result(result, 0, {1})
+
+    @update_after_operation
+    async def set_main_color_temp(self, color_temp: int) -> bool:
+        """Set the main (warm-white) sub-light color temperature (sub_cmd 0x10)."""
+        self._validate_color_temp(color_temp)
+        hex_data = f"{color_temp:04X}"
+        result = await self._send_command(
+            self._set_main_color_temp_command.format(hex_data)
+        )
+        return self._check_command_result(result, 0, {1})
+
+    async def get_basic_info(self) -> dict[str, Any] | None:
+        """
+        Read the RGB color (and color temp) over GATT.
+
+        Power, brightness and color mode are taken from the advertisement
+        (which tracks them reliably). The device's 0x4A01 status response does
+        NOT carry a usable color power state - byte 1 stays 0 even when the
+        color sub-light is on - so those fields are deliberately not returned
+        here, otherwise update() would clobber the correct advertised values.
+        """
+        if not (
+            res := await self._get_multi_commands_results(self._get_basic_info_command)
+        ):
+            return None
+
+        _version_info, _data = res
+        self._state["r"] = _data[3]
+        self._state["g"] = _data[4]
+        self._state["b"] = _data[5]
+        self._state["cw"] = int.from_bytes(_data[7:9], "big")
+
+        return {
+            "r": self._state["r"],
+            "g": self._state["g"],
+            "b": self._state["b"],
+            "firmware": _version_info[2] / 10.0,
+        }

switchbot/devices/relay_switch.py

@@ -136,6 +136,14 @@ class SwitchbotRelaySwitch(SwitchbotSequenceDevice, SwitchbotEncryptedDevice):
 
         if not (_data := await self._get_basic_info(COMMAND_GET_BASIC_INFO)):
             return None
+        if len(_data) < 17:
+            _LOGGER.warning(
+                "%s: Short basic-info response (%d bytes): %s",
+                self.name,
+                len(_data),
+                _data.hex(),
+            )
+            return None
         if not (
             _channel1_data := await self._get_basic_info(
                 COMMAND_GET_CHANNEL1_INFO.format(
@@ -144,6 +152,14 @@ class SwitchbotRelaySwitch(SwitchbotSequenceDevice, SwitchbotEncryptedDevice):
             )
         ):
             return None
+        if len(_channel1_data) < 15:
+            _LOGGER.warning(
+                "%s: Short channel1 response (%d bytes): %s",
+                self.name,
+                len(_channel1_data),
+                _channel1_data.hex(),
+            )
+            return None
 
         _LOGGER.debug(
             "on-off hex: %s, channel1_hex_data: %s", _data.hex(), _channel1_data.hex()
@@ -223,6 +239,14 @@ class SwitchbotRelaySwitch2PM(SwitchbotRelaySwitch):
             )
         ):
             return None
+        if len(_channel2_data) < 15:
+            _LOGGER.warning(
+                "%s: Short channel2 response (%d bytes): %s",
+                self.name,
+                len(_channel2_data),
+                _channel2_data.hex(),
+            )
+            return None
 
         _LOGGER.debug("channel2_hex_data: %s", _channel2_data.hex())
 

switchbot/devices/smart_thermostat_radiator.py

@@ -41,6 +41,7 @@ MODE_TEMP_RANGE = {
 }
 
 DEFAULT_TEMP_RANGE = (5.0, 35.0)
+HYSTERESIS_IDLE_THRESHOLD = 0.5
 
 
 class SwitchbotSmartThermostatRadiator(
@@ -193,4 +194,15 @@ class SwitchbotSmartThermostatRadiator(
         """Return current action from cache."""
         if not self.is_on():
             return ClimateAction.OFF
+
+        current_temp = self.get_current_temperature()
+        target_temp = self.get_target_temperature()
+
+        if (
+            current_temp is not None
+            and target_temp is not None
+            and current_temp >= (target_temp + HYSTERESIS_IDLE_THRESHOLD)
+        ):
+            return ClimateAction.IDLE
+
         return ClimateAction.HEATING

switchbot/discovery.py

@@ -53,7 +53,7 @@ class GetSwitchbotDevices:
         devices = None
         devices = bleak.BleakScanner(
             detection_callback=self.detection_callback,
-            # TODO: Find new UUIDs to filter on. For example, see
+            # Could filter on service UUIDs once new ones are identified; see
             # https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/4ad138bb09f0fbbfa41b152ca327a78c1d0b6ba9/devicetypes/meter.md
             adapter=self._interface,
         )
@@ -65,9 +65,7 @@ class GetSwitchbotDevices:
 
         if devices is None:
             if retry < 1:
-                _LOGGER.error(
-                    "Scanning for Switchbot devices failed. Stop trying", exc_info=True
-                )
+                _LOGGER.error("Scanning for Switchbot devices failed. Stop trying")
                 return self._adv_data
 
             _LOGGER.warning(

switchbot/utils.py

@@ -17,7 +17,7 @@ def format_mac_upper(mac: str) -> str:
         to_test = to_test.replace(".", "")
 
     if len(to_test) == 12:
-        # no : included
+        # bare 12-char hex, insert colons
         return ":".join(to_test.upper()[i : i + 2] for i in range(0, 12, 2))
 
     # Not sure how formatted, return original

pyswitchbot-2.2.0.dist-info/RECORD

@@ -1,81 +0,0 @@
-pyswitchbot-2.2.0.dist-info/licenses/LICENSE,sha256=_hdUCmoRDzki4fYDJfn-5KpG7-7p6YJ6IsbMfrTXN6Y,1078
-switchbot/__init__.py,sha256=FApjrCQXf1Tsg0Qvd6b6KNIjdUdbgZlsmF2Lcb_I0qY,4086
-switchbot/adv_parser.py,sha256=os5xmsISvp8K3xu0TvWFY9stwK-YLSbRUteiw5T7hXg,33146
-switchbot/api_config.py,sha256=WSsoKkgNORkbqBZDH0U0rsEwc-etpBDTCXLSJnChsPA,263
-switchbot/discovery.py,sha256=GvD8r5gkJ11Lj6Ya9-5n37mJNcoMAwXFCtLpC8aSveM,6405
-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=a_Plftx7z3BY2Lyyb4REnDG2a-kybyCKitzGvspPXT8,706
-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=kOaOtNgZDqoQ3KX9keDtehleAg2ET0nrxGV4mO68YJM,1513
-switchbot/adv_parsers/art_frame.py,sha256=spZFXKFsP5YixH6fjKpUkqSMl6HRmUQsBCjRwxAANHs,959
-switchbot/adv_parsers/blind_tilt.py,sha256=jLgoxKKkBNPhhA1w6s3Vm9yjLBsVU5u7lddwiQ1kVb0,827
-switchbot/adv_parsers/bot.py,sha256=aq0NA4G3tNvgMxpVa8KmNSOqwZYrxrB-Tz73oULkG-U,637
-switchbot/adv_parsers/bulb.py,sha256=rCteaPC7Z1Wz_gXKJLCoxbzZgJPpZNcfs9OywGJErek,633
-switchbot/adv_parsers/ceiling_light.py,sha256=ONrehUpH-e7JB9fB0wKj1o-HkPsk9Y2n7blP5U4px3Q,668
-switchbot/adv_parsers/climate_panel.py,sha256=z9ZiMKkKR8-H_omTO1lSNqgqM8SbnNRasg_FeYuIN-M,1257
-switchbot/adv_parsers/contact.py,sha256=VYAsEmIikeyJUKSYDfpwpDS9BjnaBX4pArIglcEyja8,1271
-switchbot/adv_parsers/curtain.py,sha256=LfALqzwQKTdtlG8ykqTmwvh65elEpIJ4TfUI1sGPaWc,1182
-switchbot/adv_parsers/fan.py,sha256=eOJ2uEllksuw30BuCCMJ2ut23jQehNue44SmEk2F3Vo,1796
-switchbot/adv_parsers/hub2.py,sha256=tKoOp30LCkJvwu-paptuSuvx8JQOxGMWsrmU73JZfus,1563
-switchbot/adv_parsers/hub3.py,sha256=V5VdGS39Pp0G_lqw5Kdfe1X6-K_ryfxlBKpnj3D9sVQ,1883
-switchbot/adv_parsers/hubmini_matter.py,sha256=gNZh2jChGyypN2HbamNZGKI_Bc2U8u491hQE2RnshOM,933
-switchbot/adv_parsers/humidifier.py,sha256=UTZdGETPGdpCn5md50OlszHiNKoTVcbwJeSNW-oyfFs,3070
-switchbot/adv_parsers/keypad.py,sha256=_MkQOmCEMliiM48mmq3wZ3xcUR28WiAe2rPi74COlxo,548
-switchbot/adv_parsers/keypad_vision.py,sha256=fN5V9VgVOn9cv1xs6HzACKNnoXLP1xo38EQKhq3VRJY,2293
-switchbot/adv_parsers/leak.py,sha256=eIvX2N0E0C_XCXGJQCp9L14uFQ76xMp2TLRHLOJQhrc,918
-switchbot/adv_parsers/light_strip.py,sha256=Pyyyq2oWmYHpJkE087VJLSO_og0rMEcX3q74EQoIAbk,1624
-switchbot/adv_parsers/lock.py,sha256=jpXW44JGOc2q0cnkCvH4nklvSd7TyMGjc1bdgA4tAzc,3303
-switchbot/adv_parsers/meter.py,sha256=vQAi2lZJNYzXYhQ4hMcI0VAlUwv_O95VVJuEfpcEf1U,1052
-switchbot/adv_parsers/motion.py,sha256=4bDLPg1u9Y_c_SY_KW2TrNnhOVnLazOa1qT4JFPu_68,1217
-switchbot/adv_parsers/plug.py,sha256=M6Xo8_0R4FuRUNmK4_HI1IkHGRqdvBHta4XDnyOUDVk,487
-switchbot/adv_parsers/presence_sensor.py,sha256=oDHZ_RHcMtV2Rp1N3fMNePwTuM9Q3eH5JEYp1Yt-X5s,1331
-switchbot/adv_parsers/relay_switch.py,sha256=akP8XTWcu_EmVUfyMQb1wr9xHR0FEuksRR6eGqsp3EI,1836
-switchbot/adv_parsers/remote.py,sha256=rQyi9QptFwWNxeqduec0p_3xapAEDjwyC-D1Absfm0w,433
-switchbot/adv_parsers/roller_shade.py,sha256=VXdPkkIGFuhRSJMAuocZ_9fHuIAV0mZqRt7NQdZ-H8Y,932
-switchbot/adv_parsers/smart_thermostat_radiator.py,sha256=-MKrvFM2I5k6RKHqENUo7VnJJyAu2kq1jJiQ_JDQ3WY,1773
-switchbot/adv_parsers/vacuum.py,sha256=vj5EjWdLkApiPsrZoGN1--Xm16QGxn5IKe0bjEet1G4,2065
-switchbot/adv_parsers/weather_station.py,sha256=HOCZ-gef7e6HrOdfzcIx12rV9XURwoCetUQuShyk1R4,1155
-switchbot/const/__init__.py,sha256=c9eMos2QBp0ht7BgA6-YRUbvZvSSgiwhA8G9R6eLDEw,4381
-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
-switchbot/const/fan.py,sha256=PbKmjNo4NHA_q-Tto3JBcNr71lzqQEWqk1zx_olN64Y,1250
-switchbot/const/hub2.py,sha256=K1nh-FMn0wxjk3s7kPir_1NMcuR0eNcmVXCiDX2t5xM,445
-switchbot/const/hub3.py,sha256=UQwk_NVimMd1aqS1LOkLrL7PTySZzcr0WYnpk3EFPFk,308
-switchbot/const/light.py,sha256=MRgIUyVyv_vsvrts82TbfWuT6q3rQnP2KURfdB8a7pA,644
-switchbot/const/lock.py,sha256=wKvq5uctsKpcM6gSzxPrcvmezzRhPZPd5n948I8R4n0,342
-switchbot/const/presence_sensor.py,sha256=X2oCfl0rbdd1-dSrqQFn3NDtEBXbti-87DbWq7NyN3A,135
-switchbot/devices/__init__.py,sha256=_fyzMy8qWC_2Y1BJ4hggrCP1udNqSoU6wFmfOiYpEl0,32
-switchbot/devices/air_purifier.py,sha256=JwT5HHQLvkDdFrDEKFT8sA41bM2G_DGfuOpf-74Smyw,10620
-switchbot/devices/art_frame.py,sha256=JUb7s9ZgnPxfc3K-shxuWItiMorelzldew53PwQHr4A,4361
-switchbot/devices/base_cover.py,sha256=UWNA7eGbJdY80Mu-k41xO4tnyk7FhpYaWRWihGvDM2g,4385
-switchbot/devices/base_light.py,sha256=WWJJdRHfvoSYMRHDSv_RCmo5D6hYoZRxQVYfsOXZ7K0,6590
-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=45UsGj_gPQv8tJO40UtkzOBYvE-PZovGEgOYlMGaacc,2645
-switchbot/devices/contact.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
-switchbot/devices/curtain.py,sha256=p3qcPWHaSA5ewPONl811hL7swFRca37Omb2LKYoAxgo,7086
-switchbot/devices/device.py,sha256=vQzJZQ_cpu2EadLEwzslq--cq2xk7euU0jqlMAhZ0QQ,49467
-switchbot/devices/evaporative_humidifier.py,sha256=Dmpg4oCp02iPBz6gc7z5nobio5rDyLoSLP3Oil6sRJ4,8279
-switchbot/devices/fan.py,sha256=S431LLjGBb9d_B6EB71rTWZDw0sCG6HYtG09phtkaQ8,9008
-switchbot/devices/humidifier.py,sha256=oqtRFMSA5ZSaKMEisg1gwHwWQeWBcEt21N5Qg-fqeTc,3433
-switchbot/devices/keypad.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
-switchbot/devices/keypad_vision.py,sha256=hhkbzT_uWqGy07pcReNlfAjcU5r27O4HI45xBiPAi1M,5367
-switchbot/devices/light_strip.py,sha256=-hBEpR9BHG4B5pIxbrGZKRMSgImM1we0ziPqxfqYLa8,10562
-switchbot/devices/lock.py,sha256=GNytU2mBoDFIQxHPVS_XEcydhUt2HHa_rdIHLUclGLM,11878
-switchbot/devices/meter.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
-switchbot/devices/meter_pro.py,sha256=tUprQ_9MEhJCFGBu1UFrQzndaM5yVFbuQBItboNrULA,6996
-switchbot/devices/motion.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
-switchbot/devices/plug.py,sha256=RqOppC3KmjROxukHFLNttEhDg7-hH_IaiTCfXWXwF_k,1397
-switchbot/devices/relay_switch.py,sha256=uQAUZyptTWQVqfUUIQJAgGrQzty0j0Cmfb5g-A-I3ts,9746
-switchbot/devices/roller_shade.py,sha256=Lv3DDUgnlxArJY6qQc9HXxJwd7NcPEYmQvWnWn_yWdE,6431
-switchbot/devices/smart_thermostat_radiator.py,sha256=m8Ex32O6qqzO08XlZAefAFpIfwkKWI_pIFxqB0qb5Gs,6601
-switchbot/devices/vacuum.py,sha256=qzeEaXPNIs8B-FyH7NLnAqXSxd5dB7ioq6tSiajF-LM,2287
-pyswitchbot-2.2.0.dist-info/METADATA,sha256=EAJbE30uQoO9L1jaUltWOYUGlTRAFVkT5a7o1vDMLYM,4197
-pyswitchbot-2.2.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-pyswitchbot-2.2.0.dist-info/top_level.txt,sha256=HUeT93OSFPT5mzylEY3uhH7bvqiVvcpGx6XBAELiRxg,10
-pyswitchbot-2.2.0.dist-info/RECORD,,

pyswitchbot-2.2.0.dist-info/top_level.txt

@@ -1 +0,0 @@
-switchbot