fix: Fix Handling of poll check-in failed for Tuya TS0203 Koenkk/zi…

…gbee2mqtt#24938
Koenkk · Dec 3, 2024 · 286d454 · 286d454
1 parent 8528633
commit 286d454
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/devices/adeo.ts b/src/devices/adeo.ts
@@ -326,7 +326,10 @@ const definitions: DefinitionWithExtend[] = [
         exposes: [e.warning(), e.battery(), e.battery_low(), e.tamper()],
         extend: [quirkCheckinInterval(0)],
         configure: async (device, coordinatorEndpoint) => {
-            await device.getEndpoint(1).unbind('genPollCtrl', coordinatorEndpoint);
+            const endpoint = device.getEndpoint(1);
+            if (endpoint.binds.some((b) => b.cluster.name === 'genPollCtrl')) {
+                await endpoint.unbind('genPollCtrl', coordinatorEndpoint);
+            }
         },
     },
     {

diff --git a/src/devices/bosch.ts b/src/devices/bosch.ts
@@ -1127,7 +1127,9 @@ const definitions: DefinitionWithExtend[] = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'ssIasZone', 'ssIasWd', 'genBasic']);
             await reporting.batteryVoltage(endpoint);
             await endpoint.read(0x0502, [0xa000, 0xa001, 0xa002, 0xa003, 0xa004, 0xa005], manufacturerOptions);
-            await endpoint.unbind('genPollCtrl', coordinatorEndpoint);
+            if (endpoint.binds.some((b) => b.cluster.name === 'genPollCtrl')) {
+                await endpoint.unbind('genPollCtrl', coordinatorEndpoint);
+            }
         },
         exposes: [
             e.binary('alarm_state', ea.ALL, 'ON', 'OFF').withDescription('Alarm turn ON/OFF'),

diff --git a/src/devices/tuya.ts b/src/devices/tuya.ts
@@ -923,6 +923,11 @@ const definitions: DefinitionWithExtend[] = [
             } catch {
                 /* Fails for some*/
             }
+
+            const endpoint = device.getEndpoint(1);
+            if (endpoint.binds.some((b) => b.cluster.name === 'genPollCtrl')) {
+                await endpoint.unbind('genPollCtrl', coordinatorEndpoint);
+            }
         },
     },
     {