From 9a929aca3200efcd14fc0c4ffb77a7b9d89f1853 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <karora@users.noreply.github.com>
Date: Thu, 9 Oct 2025 12:02:35 +1300
Subject: [PATCH 1/3] Update ts0601_cover.py to add _TZE200_vexa5o82

Yet another variant of the Tuya Smart Blinds
---
 zhaquirks/tuya/ts0601_cover.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zhaquirks/tuya/ts0601_cover.py b/zhaquirks/tuya/ts0601_cover.py
index 77b8796f1d..979d9b39a5 100644
--- a/zhaquirks/tuya/ts0601_cover.py
+++ b/zhaquirks/tuya/ts0601_cover.py
@@ -381,6 +381,7 @@ class TuyaMoesCover0601(TuyaWindowCover):
             ("_TZE200_icka1clh", "TS0601"),
             ("_TZE200_1vxgqfba", "TS0601"),
             ("_TZE200_fctwhugx", "TS0601"),
+            ("_TZE200_vexa5o82", "TS0601"),
         ],
         ENDPOINTS: {
             1: {

From 3a2704d1f2971deb980d9aac4fa44d93034ce34a Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@mcmillan.net.nz>
Date: Wed, 15 Oct 2025 15:56:50 +1300
Subject: [PATCH 2/3] Add battery percent support for more models

---
 zhaquirks/tuya/__init__.py     | 15 +++++++++++++++
 zhaquirks/tuya/ts0601_cover.py |  5 +++++
 2 files changed, 20 insertions(+)

diff --git a/zhaquirks/tuya/__init__.py b/zhaquirks/tuya/__init__.py
index c66d692887..43317bc8da 100644
--- a/zhaquirks/tuya/__init__.py
+++ b/zhaquirks/tuya/__init__.py
@@ -54,6 +54,7 @@
 TUYA_MCU_VERSION_RSP = 0x11
 TUYA_LEVEL_COMMAND = 514
 
+BATTERY_CHANGE = "battery_change"
 LEVEL_EVENT = "level_event"
 TUYA_MCU_COMMAND = "tuya_mcu_command"
 
@@ -1235,6 +1236,16 @@ def handle_cluster_request(
                     ATTR_COVER_INVERTED,
                     tuya_payload.data[1],  # Check this
                 )
+            elif (
+                self.endpoint.device.tuya_battery_attr is not None
+                and tuya_payload.command_id
+                == TUYA_DP_TYPE_VALUE + self.endpoint.device.tuya_battery_attr
+            ):
+                self.endpoint.device.battery_bus.listener_event(
+                    BATTERY_CHANGE,
+                    tuya_payload.data[4],
+                )
+
         elif hdr.command_id == TUYA_SET_TIME:
             """Time event call super"""
             super().handle_cluster_request(hdr, args, dst_addressing=dst_addressing)
@@ -1377,9 +1388,13 @@ class TuyaWindowCover(CustomDevice):
     # Don't invert _TZE200_cowvfni3: https://github.com/Koenkk/zigbee2mqtt/issues/6043
     tuya_cover_inverted_by_default = False
 
+    # For covers which report battery, this sets the battery report attribute id
+    tuya_battery_attr = None
+
     def __init__(self, *args, **kwargs):
         """Init device."""
         self.cover_bus = Bus()
+        self.battery_bus = Bus()
         super().__init__(*args, **kwargs)
 
 
diff --git a/zhaquirks/tuya/ts0601_cover.py b/zhaquirks/tuya/ts0601_cover.py
index 979d9b39a5..86cfa108fc 100644
--- a/zhaquirks/tuya/ts0601_cover.py
+++ b/zhaquirks/tuya/ts0601_cover.py
@@ -16,8 +16,10 @@
     TuyaManufCluster,
     TuyaWindowCover,
     TuyaWindowCoverControl,
+    TuyaPowerConfigurationCluster,
 )
 
+ZEMISMART_BATTERY_ATTR = 0x0D
 
 class TuyaZemismartSmartCover0601(TuyaWindowCover):
     """Tuya Zemismart blind cover motor."""
@@ -352,6 +354,8 @@ class TuyaZemismartSmartCover0601_2_inv_position(TuyaWindowCover):
 class TuyaMoesCover0601(TuyaWindowCover):
     """Tuya blind controller device."""
 
+    tuya_battery_attr = ZEMISMART_BATTERY_ATTR
+
     signature = {
         # "node_descriptor": "NodeDescriptor(byte1=2, byte2=64, mac_capability_flags=128, manufacturer_code=4098,
         #                    maximum_buffer_size=82, maximum_incoming_transfer_size=82, server_mask=11264,
@@ -408,6 +412,7 @@ class TuyaMoesCover0601(TuyaWindowCover):
                     Scenes.cluster_id,
                     TuyaManufacturerWindowCover,
                     TuyaWindowCoverControl,
+                    TuyaPowerConfigurationCluster,
                 ],
                 OUTPUT_CLUSTERS: [Time.cluster_id, Ota.cluster_id],
             }

From b0c0dfe3029e18bbb38ea431f290dbb54a59f7d6 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 15 Oct 2025 02:58:22 +0000
Subject: [PATCH 3/3] Apply pre-commit auto fixes

---
 zhaquirks/tuya/ts0601_cover.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/zhaquirks/tuya/ts0601_cover.py b/zhaquirks/tuya/ts0601_cover.py
index 86cfa108fc..3f4c21f2e8 100644
--- a/zhaquirks/tuya/ts0601_cover.py
+++ b/zhaquirks/tuya/ts0601_cover.py
@@ -14,13 +14,14 @@
 from zhaquirks.tuya import (
     TuyaManufacturerWindowCover,
     TuyaManufCluster,
+    TuyaPowerConfigurationCluster,
     TuyaWindowCover,
     TuyaWindowCoverControl,
-    TuyaPowerConfigurationCluster,
 )
 
 ZEMISMART_BATTERY_ATTR = 0x0D
 
+
 class TuyaZemismartSmartCover0601(TuyaWindowCover):
     """Tuya Zemismart blind cover motor."""