Updates

Author: PlusPlus-ua

README.md

@@ -23,7 +23,7 @@ The integration works locally, but connection to Tuya BLE device requires device
 * Fingerbots (category_id 'szjqr')
   + Fingerbot (product_ids 'ltak7e1p', 'y6kttvd6', 'yrnk7mnn', 'nvr2rocq', 'bnt7wajf', 'rvdceqjh', '5xhbk964'), original device, first in category, powered by CR2 battery.
   + Adaprox Fingerbot (product_id 'y6kttvd6'), built-in battery with USB type C charging.
-  + Fingerbot Plus (product_ids 'blliqpsj', 'yiihr7zh'), almost same as original, has sensor button for manual control.
+  + Fingerbot Plus (product_ids 'blliqpsj', 'yiihr7zh', 'neq16kgd'), almost same as original, has sensor button for manual control.
   + CubeTouch 1s (product_id '3yqdo5yt'), built-in battery with USB type C charging.
   + CubeTouch II (product_id 'xhf790if'), built-in battery with USB type C charging.
 
@@ -41,6 +41,9 @@ The integration works locally, but connection to Tuya BLE device requires device
 * Climate (category_id 'wk')
   + Thermostatic Radiator Valve (product_ids 'drlajpqc', 'nhj2j7su'), first attempt to support for now.
 
+* Smart water bottle (category_id 'znhsb')
+  + Smart water bottle (product_id 'cdlandip')
+
 ## Support project
 
 I am working on this integration in Ukraine. Our country was subjected to brutal aggression by Russia. The war still continues. The capital of Ukraine - Kyiv, where I live, and many other cities and villages are constantly under threat of rocket attacks. Our air defense forces are doing wonders, but they also need support. So if you want to help the development of this integration, donate some money and I will spend it to support our air defense.

custom_components/tuya_ble/button.py

@@ -69,7 +69,12 @@ class TuyaBLECategoryButtonMapping:
                 ],
             ),
             **dict.fromkeys(
-                ["blliqpsj", "ndvkgsrm", "yiihr7zh"],  # Fingerbot Plus
+                [
+                    "blliqpsj",
+                    "ndvkgsrm",
+                    "yiihr7zh", 
+                    "neq16kgd"
+                ],  # Fingerbot Plus
                 [
                     TuyaBLEFingerbotModeMapping(dp_id=2),
                 ],
@@ -90,6 +95,19 @@ class TuyaBLECategoryButtonMapping:
             ),
         },
     ),
+    "znhsb": TuyaBLECategoryButtonMapping(
+        products={
+            "cdlandip":  # Smart water bottle
+            [
+                TuyaBLEButtonMapping(
+                    dp_id=109,
+                    description=ButtonEntityDescription(
+                        key="bright_lid_screen",
+                    ),
+                ),
+            ],
+        },
+    ),
 }
 
 

custom_components/tuya_ble/const.py

@@ -36,5 +36,6 @@
 
 FINGERBOT_MODE_PUSH: Final = "push"
 FINGERBOT_MODE_SWITCH: Final = "switch"
+FINGERBOT_MODE_PROGRAM: Final = "program"
 FINGERBOT_BUTTON_EVENT: Final = "fingerbot_button_pressed"
 

custom_components/tuya_ble/devices.py

@@ -127,7 +127,7 @@ def _async_handle_update(self, updates: list[TuyaBLEDataPoint]) -> None:
         self._async_handle_connect()
         self.async_set_updated_data(None)
         info = get_device_product_info(self._device)
-        if info.fingerbot and info.fingerbot.manual_control != 0:
+        if info and info.fingerbot and info.fingerbot.manual_control != 0:
             for update in updates:
                 if update.id == info.fingerbot.switch and update.changed_by_device:
                     self.hass.bus.fire(
@@ -212,7 +212,12 @@ class TuyaBLECategoryInfo:
                 ),
             ),
             **dict.fromkeys(
-                ["blliqpsj", "ndvkgsrm", "yiihr7zh"],  # device product_ids
+                [
+                    "blliqpsj",
+                    "ndvkgsrm",
+                    "yiihr7zh", 
+                    "neq16kgd"
+                ],  # device product_ids
                 TuyaBLEProductInfo(
                     name="Fingerbot Plus",
                     fingerbot=TuyaBLEFingerbotInfo(
@@ -253,11 +258,11 @@ class TuyaBLECategoryInfo:
     "wk": TuyaBLECategoryInfo(
         products={
             **dict.fromkeys(
-                [
-                "drlajpqc", 
-                "nhj2j7su",
-                ],  # device product_id
-                TuyaBLEProductInfo(
+            [
+            "drlajpqc", 
+            "nhj2j7su",
+            ],  # device product_id
+            TuyaBLEProductInfo(  
                 name="Thermostatic Radiator Valve",
                 ),
             ),
@@ -270,6 +275,14 @@ class TuyaBLECategoryInfo:
             ),
         },
     ),
+    "znhsb": TuyaBLECategoryInfo(
+        products={
+            "cdlandip":  # device product_id
+            TuyaBLEProductInfo(
+                name="Smart water bottle",
+            ),
+        },
+    ),
 }
 
 

custom_components/tuya_ble/number.py

@@ -10,13 +10,14 @@
     NumberEntityDescription,
     NumberEntity,
 )
-from homeassistant.components.number.const import NumberMode
+from homeassistant.components.number.const import NumberDeviceClass, NumberMode
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONCENTRATION_PARTS_PER_MILLION,
     PERCENTAGE,
     TIME_MINUTES,
     TIME_SECONDS,
+    VOLUME_MILLILITERS,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -36,7 +37,9 @@
 )
 
 
-TuyaBLENumberIsAvailable = Callable[["TuyaBLENumber", TuyaBLEProductInfo], bool] | None
+TuyaBLENumberIsAvailable = (
+    Callable[["TuyaBLENumber", TuyaBLEProductInfo], bool] | None
+)
 
 
 TuyaBLENumberSetter = (
@@ -57,6 +60,33 @@ class TuyaBLENumberMapping:
     mode: NumberMode = NumberMode.BOX
 
 
+def is_fingerbot_not_in_program_mode(self: TuyaBLENumber, product: TuyaBLEProductInfo) -> bool:
+    result: bool = True
+    if product.fingerbot:
+        datapoint = self._device.datapoints[product.fingerbot.mode]
+        if datapoint:
+            result = datapoint.value != 2
+    return result
+
+
+def is_fingerbot_in_program_mode(self: TuyaBLENumber, product: TuyaBLEProductInfo) -> bool:
+    result: bool = True
+    if product.fingerbot:
+        datapoint = self._device.datapoints[product.fingerbot.mode]
+        if datapoint:
+            result = datapoint.value == 2
+    return result
+
+
+def is_fingerbot_in_push_mode(self: TuyaBLENumber, product: TuyaBLEProductInfo) -> bool:
+    result: bool = True
+    if product.fingerbot:
+        datapoint = self._device.datapoints[product.fingerbot.mode]
+        if datapoint:
+            result = datapoint.value == 0
+    return result
+
+
 @dataclass
 class TuyaBLEDownPositionDescription(NumberEntityDescription):
     key: str = "down_position"
@@ -79,15 +109,6 @@ class TuyaBLEUpPositionDescription(NumberEntityDescription):
     entity_category: EntityCategory = EntityCategory.CONFIG
 
 
-def is_fingerbot_in_push_mode(self: TuyaBLENumber, product: TuyaBLEProductInfo) -> bool:
-    result: bool = True
-    if product.fingerbot:
-        datapoint = self._device.datapoints[product.fingerbot.mode]
-        if datapoint:
-            result = datapoint.value == 0
-    return result
-
-
 @dataclass
 class TuyaBLEHoldTimeDescription(NumberEntityDescription):
     key: str = "hold_time"
@@ -183,16 +204,23 @@ class TuyaBLECategoryNumberMapping:
                 ],
             ),
             **dict.fromkeys(
-                ["blliqpsj", "ndvkgsrm", "yiihr7zh"],  # Fingerbot Plus
+                [
+                    "blliqpsj",
+                    "ndvkgsrm",
+                    "yiihr7zh", 
+                    "neq16kgd"
+                ],  # Fingerbot Plus
                 [
                     TuyaBLENumberMapping(
                         dp_id=9,
                         description=TuyaBLEDownPositionDescription(),
+                        is_available=is_fingerbot_not_in_program_mode,
                     ),
                     TuyaBLEHoldTimeMapping(dp_id=10),
                     TuyaBLENumberMapping(
                         dp_id=15,
                         description=TuyaBLEUpPositionDescription(),
+                        is_available=is_fingerbot_not_in_program_mode,
                     ),
                 ],
             ),
@@ -210,6 +238,7 @@ class TuyaBLECategoryNumberMapping:
                     TuyaBLENumberMapping(
                         dp_id=9,
                         description=TuyaBLEDownPositionDescription(),
+                        is_available=is_fingerbot_not_in_program_mode,
                     ),
                     TuyaBLENumberMapping(
                         dp_id=10,
@@ -222,6 +251,7 @@ class TuyaBLECategoryNumberMapping:
                     TuyaBLENumberMapping(
                         dp_id=15,
                         description=TuyaBLEUpPositionDescription(),
+                        is_available=is_fingerbot_not_in_program_mode,
                     ),
                 ],
             ),
@@ -235,17 +265,17 @@ class TuyaBLECategoryNumberMapping:
                 "nhj2j7su",
                 ],  # Thermostatic Radiator Valve
                 [
-                TuyaBLENumberMapping(
-                    dp_id=27,
-                    description=NumberEntityDescription(
-                        key="temperature_calibration",
-                        icon="mdi:thermometer-lines",
-                        native_max_value=6,
-                        native_min_value=-6,
-                        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-                        native_step=1,
-                        entity_category=EntityCategory.CONFIG,
-                        entity_registry_enabled_default=True,
+                    TuyaBLENumberMapping(
+                        dp_id=27,
+                        description=NumberEntityDescription(
+                            key="temperature_calibration",
+                            icon="mdi:thermometer-lines",
+                            native_max_value=6,
+                            native_min_value=-6,
+                            native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+                            native_step=1,
+                            entity_category=EntityCategory.CONFIG,
+                            entity_registry_enabled_default=True,
                         ),
                     ),
                 ],
@@ -270,6 +300,25 @@ class TuyaBLECategoryNumberMapping:
             ],
         },
     ),
+    "znhsb": TuyaBLECategoryNumberMapping(
+        products={
+            "cdlandip":  # Smart water bottle
+            [
+                TuyaBLENumberMapping(
+                    dp_id=103,
+                    description=NumberEntityDescription(
+                        key="recommended_water_intake",
+                        device_class= NumberDeviceClass.WATER,
+                        native_max_value=5000,
+                        native_min_value=0,
+                        native_unit_of_measurement=VOLUME_MILLILITERS,
+                        native_step=1,
+                        entity_category=EntityCategory.CONFIG,
+                    ),
+                ),
+            ],
+        },
+    ),
 }
 
 

custom_components/tuya_ble/select.py

@@ -18,6 +18,7 @@
 
 from .const import (
     DOMAIN,
+    FINGERBOT_MODE_PROGRAM,
     FINGERBOT_MODE_PUSH,
     FINGERBOT_MODE_SWITCH,
 )
@@ -48,7 +49,12 @@ class TuyaBLEFingerbotModeMapping(TuyaBLESelectMapping):
         default_factory=lambda: SelectEntityDescription(
             key="fingerbot_mode",
             entity_category=EntityCategory.CONFIG,
-            options=[FINGERBOT_MODE_PUSH, FINGERBOT_MODE_SWITCH],
+            options=
+                [
+                    FINGERBOT_MODE_PUSH, 
+                    FINGERBOT_MODE_SWITCH,
+                    FINGERBOT_MODE_PROGRAM,
+                ],
         )
     )
 
@@ -105,7 +111,12 @@ class TuyaBLECategorySelectMapping:
                 ],
             ),
             **dict.fromkeys(
-                ["blliqpsj", "ndvkgsrm", "yiihr7zh"],  # Fingerbot Plus
+                [
+                    "blliqpsj",
+                    "ndvkgsrm",
+                    "yiihr7zh", 
+                    "neq16kgd"
+                ],  # Fingerbot Plus
                 [
                     TuyaBLEFingerbotModeMapping(dp_id=8),
                 ],
@@ -137,6 +148,33 @@ class TuyaBLECategorySelectMapping:
             ],
         },
     ),
+    "znhsb": TuyaBLECategorySelectMapping(
+        products={
+            "cdlandip":  # Smart water bottle
+            [
+                TuyaBLESelectMapping(
+                    dp_id=106,
+                    description=TemperatureUnitDescription(
+                        options=[
+                            UnitOfTemperature.CELSIUS,
+                            UnitOfTemperature.FAHRENHEIT,
+                        ],
+                    )
+                ),
+                TuyaBLESelectMapping(
+                    dp_id=107,
+                    description=SelectEntityDescription(
+                        key="reminder_mode",
+                        options=[
+                            "interval_reminder",
+                            "schedule_reminder",
+                        ],
+                        entity_category=EntityCategory.CONFIG,
+                    ),
+                ),
+            ],
+        },
+    ),
 }