Correct manufacturers for Xfinity security keypads (#2974)

* Correct manufacturers for various models of Xfinity security keypads * Update universal_electronics_inc.js * Update universal_electronics_inc.js * Update universal_electronics_inc.js Co-authored-by: Adrien PELLE <adrien.pelle@thalesgroup.com> Co-authored-by: Koen Kanters <koenkanters94@gmail.com>
Koenkk · Aug 30, 2021 · 863859c · 863859c
1 parent 9ac8b77
commit 863859c
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 35 deletions.
diff --git a/devices/xfinity.js → devices/technicolor.js b/devices/xfinity.js → devices/technicolor.js
@@ -7,44 +7,11 @@ const e = exposes.presets;
 const ea = exposes.access;
 
 module.exports = [
-    {
-        zigbeeModel: ['URC4450BC0-X-R'],
-        model: 'URC4450BC0-X-R',
-        vendor: 'Xfinity',
-        description: 'Alarm security keypad',
-        meta: {battery: {voltageToPercentage: '3V_2100'}},
-        fromZigbee: [fz.command_arm, fz.temperature, fz.battery, fz.ias_occupancy_alarm_1, fz.identify, fz.ias_contact_alarm_1,
-            fz.ias_ace_occupancy_with_timeout],
-        exposes: [e.battery(), e.battery_voltage(), e.occupancy(), e.battery_low(), e.tamper(), e.presence(), e.contact(),
-            exposes.numeric('action_code', ea.STATE), exposes.text('action_zone', ea.STATE), e.temperature(), e.action([
-                'disarm', 'arm_day_zones', 'identify', 'arm_night_zones', 'arm_all_zones', 'exit_delay', 'emergency',
-            ])],
-        toZigbee: [tz.arm_mode],
-        configure: async (device, coordinatorEndpoint) => {
-            const endpoint = device.getEndpoint(1);
-            const clusters = ['msTemperatureMeasurement', 'genPowerCfg', 'ssIasZone', 'ssIasAce', 'genBasic', 'genIdentify'];
-            await reporting.bind(endpoint, coordinatorEndpoint, clusters);
-            await reporting.temperature(endpoint);
-            await reporting.batteryVoltage(endpoint);
-        },
-        onEvent: async (type, data, device) => {
-            if (type === 'message' && data.type === 'commandGetPanelStatus' && data.cluster === 'ssIasAce' &&
-                globalStore.hasValue(device.getEndpoint(1), 'panelStatus')) {
-                const payload = {
-                    panelstatus: globalStore.getValue(device.getEndpoint(1), 'panelStatus'),
-                    secondsremain: 0x00, audiblenotif: 0x00, alarmstatus: 0x00,
-                };
-                await device.getEndpoint(1).commandResponse(
-                    'ssIasAce', 'getPanelStatusRsp', payload, {}, data.meta.zclTransactionSequenceNumber,
-                );
-            }
-        },
-    },
     {
         zigbeeModel: ['TKA105'],
         model: 'XHK1-TC',
-        vendor: 'Xfinity',
-        description: 'Alarm security keypad',
+        vendor: 'Technicolor',
+        description: 'Xfinity security keypad',
         meta: {battery: {voltageToPercentage: '3V_2100'}},
         fromZigbee: [fz.command_arm, fz.temperature, fz.battery, fz.ias_occupancy_alarm_1, fz.identify, fz.ias_contact_alarm_1,
             fz.ias_ace_occupancy_with_timeout],

diff --git a/devices/universal_electronics_inc.js b/devices/universal_electronics_inc.js
@@ -1,7 +1,10 @@
 const exposes = require('../lib/exposes');
 const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
+const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const e = exposes.presets;
+const ea = exposes.access;
+const globalStore = require('../lib/store');
 
 module.exports = [
     {
@@ -20,4 +23,37 @@ module.exports = [
         },
         exposes: [e.contact(), e.battery_low(), e.tamper(), e.temperature(), e.battery()],
     },
+    {
+        zigbeeModel: ['URC4450BC0-X-R'],
+        model: 'XHK1-UE',
+        vendor: 'Universal Electronics Inc',
+        description: 'Xfinity security keypad',
+        meta: {battery: {voltageToPercentage: '3V_2100'}},
+        fromZigbee: [fz.command_arm, fz.temperature, fz.battery, fz.ias_occupancy_alarm_1, fz.identify, fz.ias_contact_alarm_1,
+            fz.ias_ace_occupancy_with_timeout],
+        exposes: [e.battery(), e.battery_voltage(), e.occupancy(), e.battery_low(), e.tamper(), e.presence(), e.contact(),
+            exposes.numeric('action_code', ea.STATE), exposes.text('action_zone', ea.STATE), e.temperature(), e.action([
+                'disarm', 'arm_day_zones', 'identify', 'arm_night_zones', 'arm_all_zones', 'exit_delay', 'emergency',
+            ])],
+        toZigbee: [tz.arm_mode],
+        configure: async (device, coordinatorEndpoint) => {
+            const endpoint = device.getEndpoint(1);
+            const clusters = ['msTemperatureMeasurement', 'genPowerCfg', 'ssIasZone', 'ssIasAce', 'genBasic', 'genIdentify'];
+            await reporting.bind(endpoint, coordinatorEndpoint, clusters);
+            await reporting.temperature(endpoint);
+            await reporting.batteryVoltage(endpoint);
+        },
+        onEvent: async (type, data, device) => {
+            if (type === 'message' && data.type === 'commandGetPanelStatus' && data.cluster === 'ssIasAce' &&
+                globalStore.hasValue(device.getEndpoint(1), 'panelStatus')) {
+                const payload = {
+                    panelstatus: globalStore.getValue(device.getEndpoint(1), 'panelStatus'),
+                    secondsremain: 0x00, audiblenotif: 0x00, alarmstatus: 0x00,
+                };
+                await device.getEndpoint(1).commandResponse(
+                    'ssIasAce', 'getPanelStatusRsp', payload, {}, data.meta.zclTransactionSequenceNumber,
+                );
+            }
+        },
+    },
 ];