From f5502a7626aead1eb94f1430ee237fd0b3fb72fd Mon Sep 17 00:00:00 2001 From: David Beitey Date: Tue, 13 Jun 2023 01:29:26 +1000 Subject: [PATCH] =?UTF-8?q?fix:=20Normalise=20Mercator=20Iku=C3=BC=20vendo?= =?UTF-8?q?r=20and=20device=20naming=20(#5871)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The vendor's name is Mercator Ikuü (as described at https://www.ikuu.com.au/about-us/ - the brand name is always referred to in this form, and has its own separate domain). Names are sourced from https://www.ikuu.com.au/products. Several products are EOL and names were obtained from web caches (e.g. Wayback Machine). --- src/devices/mercator.ts | 44 ++++++++++++++++++++--------------------- src/devices/tuya.ts | 5 +++-- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/devices/mercator.ts b/src/devices/mercator.ts index b906156ba37e4..236125bff3983 100644 --- a/src/devices/mercator.ts +++ b/src/devices/mercator.ts @@ -11,8 +11,8 @@ const definitions: Definition[] = [ { fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3210_yvxjawlt'}], model: 'SPP04G', - vendor: 'Mercator', - description: 'Ikuü Quad Power Point', + vendor: 'Mercator Ikuü', + description: 'Quad Power Point', extend: tuya.extend.switch({powerOutageMemory: true, electricalMeasurements: true, endpoints: ['left', 'right']}), exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('right'), e.power().withEndpoint('left'), e.current().withEndpoint('left'), @@ -33,8 +33,8 @@ const definitions: Definition[] = [ { fingerprint: [{modelID: 'TS0202', manufacturerName: '_TYZB01_qjqgmqxr'}], model: 'SMA02P', - vendor: 'Mercator', - description: 'Ikuü battery motion sensor', + vendor: 'Mercator Ikuü', + description: 'Motion Detector', fromZigbee: [fz.ias_occupancy_alarm_1, fz.battery, fz.ignore_basic_report, fz.ias_occupancy_alarm_1_report], toZigbee: [], exposes: [e.occupancy(), e.battery_low(), e.tamper(), e.battery(), e.battery_voltage()], @@ -49,8 +49,8 @@ const definitions: Definition[] = [ { fingerprint: [{modelID: 'TS0201', manufacturerName: '_TZ3000_82ptnsd4'}], model: 'SMA03P', - vendor: 'Mercator', - description: 'Ikuü temperature & humidity sensor', + vendor: 'Mercator Ikuü', + description: 'Environmental Sensor', fromZigbee: [fz.battery, fz.temperature, fz.humidity], toZigbee: [], exposes: [e.battery(), e.temperature(), e.humidity(), e.battery_voltage()], @@ -59,8 +59,8 @@ const definitions: Definition[] = [ { fingerprint: [{modelID: 'TS0203', manufacturerName: '_TZ3000_wbrlnkm9'}], model: 'SMA04P', - vendor: 'Mercator', - description: 'Ikuü battery contact sensor', + vendor: 'Mercator Ikuü', + description: 'Contact Sensor', fromZigbee: [fz.ias_contact_alarm_1, fz.battery, fz.ignore_basic_report, fz.ias_contact_alarm_1_report], toZigbee: [], exposes: [e.contact(), e.battery_low(), e.tamper(), e.battery(), e.battery_voltage()], @@ -76,22 +76,22 @@ const definitions: Definition[] = [ { fingerprint: [{modelID: 'TS0502B', manufacturerName: '_TZ3000_6dwfra5l'}], model: 'SMCL01-ZB', - vendor: 'Mercator', - description: 'Ikuü Ikon ceiling light CCT', + vendor: 'Mercator Ikuü', + description: 'Ikon Ceiling Light', extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}), }, { fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_xr5m6kfg'}], model: 'SMD4109W-RGB-ZB', - vendor: 'Mercator', - description: 'Ikuü Walter downlight RGB + CCT', + vendor: 'Mercator Ikuü', + description: '92mm Walter Downlight RGB + CCT', extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}), }, { fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3210_raqjcxo5'}], model: 'SPP02G', - vendor: 'Mercator', - description: 'Ikuü double indoors power point', + vendor: 'Mercator Ikuü', + description: 'Double Power Point', extend: tuya.extend.switch({powerOutageMemory: true, electricalMeasurements: true, endpoints: ['left', 'right']}), exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('right'), e.power().withEndpoint('left'), e.current().withEndpoint('left'), @@ -121,8 +121,8 @@ const definitions: Definition[] = [ { fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3210_7jnk7l3k'}], model: 'SPP02GIP', - vendor: 'Mercator', - description: 'Ikuü double outdoors power point', + vendor: 'Mercator Ikuü', + description: 'Double Power Point IP54', extend: tuya.extend.switch({powerOutageMemory: true, electricalMeasurements: true, endpoints: ['left', 'right']}), exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('right'), e.power().withEndpoint('left'), e.current().withEndpoint('left'), @@ -152,8 +152,8 @@ const definitions: Definition[] = [ { fingerprint: [{modelID: 'TS0013', manufacturerName: '_TZ3000_khtlvdfc'}], model: 'SSW03G', - vendor: 'Mercator', - description: 'Ikuü triple switch', + vendor: 'Mercator Ikuü', + description: 'Triple Switch', extend: tuya.extend.switch({backlightModeLowMediumHigh: true, endpoints: ['left', 'center', 'right']}), endpoint: (device) => { return {'left': 1, 'center': 2, 'right': 3}; @@ -173,8 +173,8 @@ const definitions: Definition[] = [ fingerprint: [{modelID: 'TS0501', manufacturerName: '_TZ3210_lzqq3u4r'}, {modelID: 'TS0501', manufacturerName: '_TZ3210_4whigl8i'}], model: 'SSWF01G', - description: 'Ikuü AC fan controller', - vendor: 'Mercator', + vendor: 'Mercator Ikuü', + description: 'AC Fan Controller', fromZigbee: [fz.on_off, fz.fan], toZigbee: [tz.fan_mode, tz.on_off], exposes: [e.switch(), e.fan().withModes(['off', 'low', 'medium', 'high', 'on'])], @@ -193,8 +193,8 @@ const definitions: Definition[] = [ { fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3210_pfbzs1an'}], model: 'SPPUSB02', - vendor: 'Mercator', - description: 'Ikuü double power point with USB', + vendor: 'Mercator Ikuü', + description: 'Double Power Point with USB', extend: tuya.extend.switch({powerOutageMemory: true, electricalMeasurements: true, endpoints: ['left', 'right']}), exposes: [ e.switch().withEndpoint('left'), e.switch().withEndpoint('right'), diff --git a/src/devices/tuya.ts b/src/devices/tuya.ts index e0205fb30589b..5a89d925e54bf 100644 --- a/src/devices/tuya.ts +++ b/src/devices/tuya.ts @@ -1080,8 +1080,9 @@ const definitions: Definition[] = [ vendor: 'TuYa', description: 'Zigbee Socket', whiteLabel: [ - {vendor: 'Larkkey', model: 'PS080'}, {vendor: 'Mercator', model: 'SPBS01G'}, - tuya.whitelabel('Mercator', 'SISW01', 'Ikuü inline switch', ['_TZ3210_2dfy6tol']), + {vendor: 'Larkkey', model: 'PS080'}, + {vendor: 'Mercator Ikuü', model: 'SPBS01G'}, + tuya.whitelabel('Mercator Ikuü', 'SISW01', 'Inline Switch', ['_TZ3210_2dfy6tol']), ], extend: tuya.extend.switch(), configure: async (device, coordinatorEndpoint, logger) => {