From d305002947c1e722fc132a5f9572abb964885009 Mon Sep 17 00:00:00 2001 From: Fairesoimeme Date: Sat, 25 Jan 2025 16:03:33 +0100 Subject: [PATCH 1/6] Update lixee.ts * add tariff period new value * fix chunk default description * change default chunk value to 2 --- src/devices/lixee.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/devices/lixee.ts b/src/devices/lixee.ts index 466828b526e61..1d68e78699e86 100644 --- a/src/devices/lixee.ts +++ b/src/devices/lixee.ts @@ -140,6 +140,7 @@ const fzLocal = { /* 0x0007 */ 'warnDIR2', /* 0x0008 */ 'warnDIR3', /* 0x0009 */ 'motDEtat', + /* 0x0010 */ 'tariffPeriod', /* 0x0200 */ 'currentPrice', /* 0x0201 */ 'currentIndexTarif', /* 0x0202 */ 'currentDate', @@ -974,6 +975,13 @@ const allPhaseData = [ onlyProducer: false, exposes: e.numeric('NTARF', ea.STATE).withProperty('current_index_tarif').withDescription('Current tariff index number'), }, + { + cluster: clustersDef._0xFF66, + att: 'tariffPeriod', + reportable: true, + onlyProducer: false, + exposes: e.text('Tariff', ea.STATE).withProperty('tariff_period').withDescription('Tariff Period'), + }, { cluster: clustersDef._0xFF66, att: 'currentPrice', @@ -1789,7 +1797,7 @@ const definitions: DefinitionWithExtend[] = [ .numeric(`measurement_poll_chunk`, ea.SET) .withValueMin(1) .withDescription( - `During the poll, request multiple exposes to the Zlinky at once for reducing Zigbee network overload. Too much request at once could exceed device limit. Requires Z2M restart. Default: 1`, + `During the poll, request multiple exposes to the Zlinky at once for reducing Zigbee network overload. Too much request at once could exceed device limit. Requires Z2M restart. Default: 2`, ), e .text(`tic_command_whitelist`, ea.SET) @@ -1872,7 +1880,7 @@ const definitions: DefinitionWithExtend[] = [ } else if (!globalStore.hasValue(device, 'interval')) { const seconds = options && options.measurement_poll_interval ? options.measurement_poll_interval : 600; utils.assertNumber(seconds); - const measurement_poll_chunk = options && options.measurement_poll_chunk ? options.measurement_poll_chunk : 4; + const measurement_poll_chunk = options && options.measurement_poll_chunk ? options.measurement_poll_chunk : 2; utils.assertNumber(measurement_poll_chunk); const setTimer = () => { From 312f618078da3c48325096dcf80268f3149e1e4f Mon Sep 17 00:00:00 2001 From: Fairesoimeme Date: Tue, 4 Feb 2025 11:39:00 +0100 Subject: [PATCH 2/6] Update lixee.ts --- src/devices/lixee.ts | 62 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/src/devices/lixee.ts b/src/devices/lixee.ts index 1d68e78699e86..e195f8cbf58d7 100644 --- a/src/devices/lixee.ts +++ b/src/devices/lixee.ts @@ -1,8 +1,8 @@ import {Buffer} from 'buffer'; - import fz from '../converters/fromZigbee'; import {repInterval} from '../lib/constants'; import * as exposes from '../lib/exposes'; +import {deviceAddCustomCluster} from '../lib/modernExtend'; import {logger} from '../lib/logger'; import * as reporting from '../lib/reporting'; import * as globalStore from '../lib/store'; @@ -13,6 +13,65 @@ const ea = exposes.access; const e = exposes.presets; const NS = 'zhc:lixee'; + +const local = { + modernExtend: { + addCustomClusterManuSpecificLixee: () => + deviceAddCustomCluster('liXeePrivate', { + ID: 0xff66, + manufacturerCode: ManufacturerCode.NXP_SEMICONDUCTORS, + attributes: { + currentTarif: {ID: 0x0000, type: DataType.CHAR_STR}, + tomorrowColor: {ID: 0x0001, type: DataType.CHAR_STR}, + scheduleHPHC: {ID: 0x0002, type: DataType.UINT8}, + presencePotential: {ID: 0x0003, type: DataType.UINT8}, + startNoticeEJP: {ID: 0x0004, type: DataType.UINT8}, + warnDPS: {ID: 0x0005, type: DataType.UINT16}, + warnDIR1: {ID: 0x0006, type: DataType.UINT16}, + warnDIR2: {ID: 0x0007, type: DataType.UINT16}, + warnDIR3: {ID: 0x0008, type: DataType.UINT16}, + motDEtat: {ID: 0x0009, type: DataType.CHAR_STR}, + tariffPeriod: {ID: 0x0010, type: DataType.CHAR_STR}, + currentPrice: {ID: 0x0200, type: DataType.CHAR_STR}, + currentIndexTarif: {ID: 0x0201, type: DataType.UINT8}, + currentDate: {ID: 0x0202, type: DataType.CHAR_STR}, + activeEnergyOutD01: {ID: 0x0203, type: DataType.UINT32}, + activeEnergyOutD02: {ID: 0x0204, type: DataType.UINT32}, + activeEnergyOutD03: {ID: 0x0205, type: DataType.UINT32}, + activeEnergyOutD04: {ID: 0x0206, type: DataType.UINT32}, + injectedVA: {ID: 0x0207, type: DataType.UINT16}, + injectedVAMaxN: {ID: 0x0208, type: DataType.INT16}, + injectedVAMaxN1: {ID: 0x0209, type: DataType.INT16}, + injectedActiveLoadN: {ID: 0x0210, type: DataType.INT16}, + injectedActiveLoadN1: {ID: 0x0211, type: DataType.INT16}, + drawnVAMaxN1: {ID: 0x0212, type: DataType.INT16}, + drawnVAMaxN1P2: {ID: 0x0213, type: DataType.INT16}, + drawnVAMaxN1P3: {ID: 0x0214, type: DataType.INT16}, + message1: {ID: 0x0215, type: DataType.CHAR_STR}, + message2: {ID: 0x0216, type: DataType.CHAR_STR}, + statusRegister: {ID: 0x0217, type: DataType.OCTET_STR}, + startMobilePoint1: {ID: 0x0218, type: DataType.UINT8}, + stopMobilePoint1: {ID: 0x0219, type: DataType.UINT8}, + startMobilePoint2: {ID: 0x0220, type: DataType.UINT8}, + stopMobilePoint2: {ID: 0x0221, type: DataType.UINT8}, + startMobilePoint3: {ID: 0x0222, type: DataType.UINT8}, + stopMobilePoint3: {ID: 0x0223, type: DataType.UINT8}, + relais: {ID: 0x0224, type: DataType.UINT16}, + daysNumberCurrentCalendar: {ID: 0x0225, type: DataType.UINT8}, + daysNumberNextCalendar: {ID: 0x0226, type: DataType.UINT8}, + daysProfileCurrentCalendar: {ID: 0x0227, type: DataType.LONG_OCTET_STR}, + daysProfileNextCalendar: {ID: 0x0228, type: DataType.LONG_OCTET_STR}, + linkyMode: {ID: 0x0300, type: DataType.UINT8}, + }, + commands: {}, + commandsResponse: {}, + }) + } + +} + + + /* Start ZiPulses */ const unitsZiPulses = [ @@ -1776,6 +1835,7 @@ const definitions: DefinitionWithExtend[] = [ return exposes; }, + extend:[local.modernExtend.addCustomClusterManuSpecificLixee()], options: [ exposes.options.measurement_poll_interval(), e From 677a354dd206cd38f79f854a0657a954cb494645 Mon Sep 17 00:00:00 2001 From: Fairesoimeme Date: Tue, 4 Feb 2025 11:50:51 +0100 Subject: [PATCH 3/6] Update lixee.ts --- src/devices/lixee.ts | 85 ++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/src/devices/lixee.ts b/src/devices/lixee.ts index e195f8cbf58d7..64bf81710dcee 100644 --- a/src/devices/lixee.ts +++ b/src/devices/lixee.ts @@ -1,3 +1,4 @@ +import {Zcl} from 'zigbee-herdsman'; import {Buffer} from 'buffer'; import fz from '../converters/fromZigbee'; import {repInterval} from '../lib/constants'; @@ -19,49 +20,49 @@ const local = { addCustomClusterManuSpecificLixee: () => deviceAddCustomCluster('liXeePrivate', { ID: 0xff66, - manufacturerCode: ManufacturerCode.NXP_SEMICONDUCTORS, + manufacturerCode: Zcl.ManufacturerCode.NXP_SEMICONDUCTORS, attributes: { - currentTarif: {ID: 0x0000, type: DataType.CHAR_STR}, - tomorrowColor: {ID: 0x0001, type: DataType.CHAR_STR}, - scheduleHPHC: {ID: 0x0002, type: DataType.UINT8}, - presencePotential: {ID: 0x0003, type: DataType.UINT8}, - startNoticeEJP: {ID: 0x0004, type: DataType.UINT8}, - warnDPS: {ID: 0x0005, type: DataType.UINT16}, - warnDIR1: {ID: 0x0006, type: DataType.UINT16}, - warnDIR2: {ID: 0x0007, type: DataType.UINT16}, - warnDIR3: {ID: 0x0008, type: DataType.UINT16}, - motDEtat: {ID: 0x0009, type: DataType.CHAR_STR}, - tariffPeriod: {ID: 0x0010, type: DataType.CHAR_STR}, - currentPrice: {ID: 0x0200, type: DataType.CHAR_STR}, - currentIndexTarif: {ID: 0x0201, type: DataType.UINT8}, - currentDate: {ID: 0x0202, type: DataType.CHAR_STR}, - activeEnergyOutD01: {ID: 0x0203, type: DataType.UINT32}, - activeEnergyOutD02: {ID: 0x0204, type: DataType.UINT32}, - activeEnergyOutD03: {ID: 0x0205, type: DataType.UINT32}, - activeEnergyOutD04: {ID: 0x0206, type: DataType.UINT32}, - injectedVA: {ID: 0x0207, type: DataType.UINT16}, - injectedVAMaxN: {ID: 0x0208, type: DataType.INT16}, - injectedVAMaxN1: {ID: 0x0209, type: DataType.INT16}, - injectedActiveLoadN: {ID: 0x0210, type: DataType.INT16}, - injectedActiveLoadN1: {ID: 0x0211, type: DataType.INT16}, - drawnVAMaxN1: {ID: 0x0212, type: DataType.INT16}, - drawnVAMaxN1P2: {ID: 0x0213, type: DataType.INT16}, - drawnVAMaxN1P3: {ID: 0x0214, type: DataType.INT16}, - message1: {ID: 0x0215, type: DataType.CHAR_STR}, - message2: {ID: 0x0216, type: DataType.CHAR_STR}, - statusRegister: {ID: 0x0217, type: DataType.OCTET_STR}, - startMobilePoint1: {ID: 0x0218, type: DataType.UINT8}, - stopMobilePoint1: {ID: 0x0219, type: DataType.UINT8}, - startMobilePoint2: {ID: 0x0220, type: DataType.UINT8}, - stopMobilePoint2: {ID: 0x0221, type: DataType.UINT8}, - startMobilePoint3: {ID: 0x0222, type: DataType.UINT8}, - stopMobilePoint3: {ID: 0x0223, type: DataType.UINT8}, - relais: {ID: 0x0224, type: DataType.UINT16}, - daysNumberCurrentCalendar: {ID: 0x0225, type: DataType.UINT8}, - daysNumberNextCalendar: {ID: 0x0226, type: DataType.UINT8}, - daysProfileCurrentCalendar: {ID: 0x0227, type: DataType.LONG_OCTET_STR}, - daysProfileNextCalendar: {ID: 0x0228, type: DataType.LONG_OCTET_STR}, - linkyMode: {ID: 0x0300, type: DataType.UINT8}, + currentTarif: {ID: 0x0000, type: Zcl.DataType.CHAR_STR}, + tomorrowColor: {ID: 0x0001, type: Zcl.DataType.CHAR_STR}, + scheduleHPHC: {ID: 0x0002, type: Zcl.DataType.UINT8}, + presencePotential: {ID: 0x0003, type: Zcl.DataType.UINT8}, + startNoticeEJP: {ID: 0x0004, type: Zcl.DataType.UINT8}, + warnDPS: {ID: 0x0005, type: Zcl.DataType.UINT16}, + warnDIR1: {ID: 0x0006, type: Zcl.DataType.UINT16}, + warnDIR2: {ID: 0x0007, type: Zcl.DataType.UINT16}, + warnDIR3: {ID: 0x0008, type: Zcl.DataType.UINT16}, + motDEtat: {ID: 0x0009, type: Zcl.DataType.CHAR_STR}, + tariffPeriod: {ID: 0x0010, type: Zcl.DataType.CHAR_STR}, + currentPrice: {ID: 0x0200, type: Zcl.DataType.CHAR_STR}, + currentIndexTarif: {ID: 0x0201, type: Zcl.DataType.UINT8}, + currentDate: {ID: 0x0202, type: Zcl.DataType.CHAR_STR}, + activeEnergyOutD01: {ID: 0x0203, type: Zcl.DataType.UINT32}, + activeEnergyOutD02: {ID: 0x0204, type: Zcl.DataType.UINT32}, + activeEnergyOutD03: {ID: 0x0205, type: Zcl.DataType.UINT32}, + activeEnergyOutD04: {ID: 0x0206, type: Zcl.DataType.UINT32}, + injectedVA: {ID: 0x0207, type: Zcl.DataType.UINT16}, + injectedVAMaxN: {ID: 0x0208, type: Zcl.DataType.INT16}, + injectedVAMaxN1: {ID: 0x0209, type: Zcl.DataType.INT16}, + injectedActiveLoadN: {ID: 0x0210, type: Zcl.DataType.INT16}, + injectedActiveLoadN1: {ID: 0x0211, type: Zcl.DataType.INT16}, + drawnVAMaxN1: {ID: 0x0212, type: Zcl.DataType.INT16}, + drawnVAMaxN1P2: {ID: 0x0213, type: Zcl.DataType.INT16}, + drawnVAMaxN1P3: {ID: 0x0214, type: Zcl.DataType.INT16}, + message1: {ID: 0x0215, type: Zcl.DataType.CHAR_STR}, + message2: {ID: 0x0216, type: Zcl.DataType.CHAR_STR}, + statusRegister: {ID: 0x0217, type: Zcl.DataType.OCTET_STR}, + startMobilePoint1: {ID: 0x0218, type: Zcl.DataType.UINT8}, + stopMobilePoint1: {ID: 0x0219, type: Zcl.DataType.UINT8}, + startMobilePoint2: {ID: 0x0220, type: Zcl.DataType.UINT8}, + stopMobilePoint2: {ID: 0x0221, type: Zcl.DataType.UINT8}, + startMobilePoint3: {ID: 0x0222, type: Zcl.DataType.UINT8}, + stopMobilePoint3: {ID: 0x0223, type: Zcl.DataType.UINT8}, + relais: {ID: 0x0224, type: Zcl.DataType.UINT16}, + daysNumberCurrentCalendar: {ID: 0x0225, type: Zcl.DataType.UINT8}, + daysNumberNextCalendar: {ID: 0x0226, type: Zcl.DataType.UINT8}, + daysProfileCurrentCalendar: {ID: 0x0227, type: Zcl.DataType.LONG_OCTET_STR}, + daysProfileNextCalendar: {ID: 0x0228, type: Zcl.DataType.LONG_OCTET_STR}, + linkyMode: {ID: 0x0300, type: Zcl.DataType.UINT8}, }, commands: {}, commandsResponse: {}, From 4e0c0b86423b5e71e30854656a6d84621087fbc7 Mon Sep 17 00:00:00 2001 From: Fairesoimeme Date: Tue, 4 Feb 2025 11:55:21 +0100 Subject: [PATCH 4/6] Update lixee.ts --- src/devices/lixee.ts | 86 ++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/src/devices/lixee.ts b/src/devices/lixee.ts index 64bf81710dcee..6e498bc98815f 100644 --- a/src/devices/lixee.ts +++ b/src/devices/lixee.ts @@ -20,49 +20,49 @@ const local = { addCustomClusterManuSpecificLixee: () => deviceAddCustomCluster('liXeePrivate', { ID: 0xff66, - manufacturerCode: Zcl.ManufacturerCode.NXP_SEMICONDUCTORS, - attributes: { - currentTarif: {ID: 0x0000, type: Zcl.DataType.CHAR_STR}, - tomorrowColor: {ID: 0x0001, type: Zcl.DataType.CHAR_STR}, - scheduleHPHC: {ID: 0x0002, type: Zcl.DataType.UINT8}, - presencePotential: {ID: 0x0003, type: Zcl.DataType.UINT8}, - startNoticeEJP: {ID: 0x0004, type: Zcl.DataType.UINT8}, - warnDPS: {ID: 0x0005, type: Zcl.DataType.UINT16}, - warnDIR1: {ID: 0x0006, type: Zcl.DataType.UINT16}, - warnDIR2: {ID: 0x0007, type: Zcl.DataType.UINT16}, - warnDIR3: {ID: 0x0008, type: Zcl.DataType.UINT16}, - motDEtat: {ID: 0x0009, type: Zcl.DataType.CHAR_STR}, - tariffPeriod: {ID: 0x0010, type: Zcl.DataType.CHAR_STR}, - currentPrice: {ID: 0x0200, type: Zcl.DataType.CHAR_STR}, - currentIndexTarif: {ID: 0x0201, type: Zcl.DataType.UINT8}, - currentDate: {ID: 0x0202, type: Zcl.DataType.CHAR_STR}, - activeEnergyOutD01: {ID: 0x0203, type: Zcl.DataType.UINT32}, - activeEnergyOutD02: {ID: 0x0204, type: Zcl.DataType.UINT32}, - activeEnergyOutD03: {ID: 0x0205, type: Zcl.DataType.UINT32}, - activeEnergyOutD04: {ID: 0x0206, type: Zcl.DataType.UINT32}, - injectedVA: {ID: 0x0207, type: Zcl.DataType.UINT16}, - injectedVAMaxN: {ID: 0x0208, type: Zcl.DataType.INT16}, - injectedVAMaxN1: {ID: 0x0209, type: Zcl.DataType.INT16}, - injectedActiveLoadN: {ID: 0x0210, type: Zcl.DataType.INT16}, - injectedActiveLoadN1: {ID: 0x0211, type: Zcl.DataType.INT16}, - drawnVAMaxN1: {ID: 0x0212, type: Zcl.DataType.INT16}, - drawnVAMaxN1P2: {ID: 0x0213, type: Zcl.DataType.INT16}, - drawnVAMaxN1P3: {ID: 0x0214, type: Zcl.DataType.INT16}, - message1: {ID: 0x0215, type: Zcl.DataType.CHAR_STR}, - message2: {ID: 0x0216, type: Zcl.DataType.CHAR_STR}, - statusRegister: {ID: 0x0217, type: Zcl.DataType.OCTET_STR}, - startMobilePoint1: {ID: 0x0218, type: Zcl.DataType.UINT8}, - stopMobilePoint1: {ID: 0x0219, type: Zcl.DataType.UINT8}, - startMobilePoint2: {ID: 0x0220, type: Zcl.DataType.UINT8}, - stopMobilePoint2: {ID: 0x0221, type: Zcl.DataType.UINT8}, - startMobilePoint3: {ID: 0x0222, type: Zcl.DataType.UINT8}, - stopMobilePoint3: {ID: 0x0223, type: Zcl.DataType.UINT8}, - relais: {ID: 0x0224, type: Zcl.DataType.UINT16}, - daysNumberCurrentCalendar: {ID: 0x0225, type: Zcl.DataType.UINT8}, - daysNumberNextCalendar: {ID: 0x0226, type: Zcl.DataType.UINT8}, - daysProfileCurrentCalendar: {ID: 0x0227, type: Zcl.DataType.LONG_OCTET_STR}, - daysProfileNextCalendar: {ID: 0x0228, type: Zcl.DataType.LONG_OCTET_STR}, - linkyMode: {ID: 0x0300, type: Zcl.DataType.UINT8}, + manufacturerCode: Zcl.ManufacturerCode.NXP_SEMICONDUCTORS, + attributes: { + currentTarif: {ID: 0x0000, type: Zcl.DataType.CHAR_STR}, + tomorrowColor: {ID: 0x0001, type: Zcl.DataType.CHAR_STR}, + scheduleHPHC: {ID: 0x0002, type: Zcl.DataType.UINT8}, + presencePotential: {ID: 0x0003, type: Zcl.DataType.UINT8}, + startNoticeEJP: {ID: 0x0004, type: Zcl.DataType.UINT8}, + warnDPS: {ID: 0x0005, type: Zcl.DataType.UINT16}, + warnDIR1: {ID: 0x0006, type: Zcl.DataType.UINT16}, + warnDIR2: {ID: 0x0007, type: Zcl.DataType.UINT16}, + warnDIR3: {ID: 0x0008, type: Zcl.DataType.UINT16}, + motDEtat: {ID: 0x0009, type: Zcl.DataType.CHAR_STR}, + tariffPeriod: {ID: 0x0010, type: Zcl.DataType.CHAR_STR}, + currentPrice: {ID: 0x0200, type: Zcl.DataType.CHAR_STR}, + currentIndexTarif: {ID: 0x0201, type: Zcl.DataType.UINT8}, + currentDate: {ID: 0x0202, type: Zcl.DataType.CHAR_STR}, + activeEnergyOutD01: {ID: 0x0203, type: Zcl.DataType.UINT32}, + activeEnergyOutD02: {ID: 0x0204, type: Zcl.DataType.UINT32}, + activeEnergyOutD03: {ID: 0x0205, type: Zcl.DataType.UINT32}, + activeEnergyOutD04: {ID: 0x0206, type: Zcl.DataType.UINT32}, + injectedVA: {ID: 0x0207, type: Zcl.DataType.UINT16}, + injectedVAMaxN: {ID: 0x0208, type: Zcl.DataType.INT16}, + injectedVAMaxN1: {ID: 0x0209, type: Zcl.DataType.INT16}, + injectedActiveLoadN: {ID: 0x0210, type: Zcl.DataType.INT16}, + injectedActiveLoadN1: {ID: 0x0211, type: Zcl.DataType.INT16}, + drawnVAMaxN1: {ID: 0x0212, type: Zcl.DataType.INT16}, + drawnVAMaxN1P2: {ID: 0x0213, type: Zcl.DataType.INT16}, + drawnVAMaxN1P3: {ID: 0x0214, type: Zcl.DataType.INT16}, + message1: {ID: 0x0215, type: Zcl.DataType.CHAR_STR}, + message2: {ID: 0x0216, type: Zcl.DataType.CHAR_STR}, + statusRegister: {ID: 0x0217, type: Zcl.DataType.OCTET_STR}, + startMobilePoint1: {ID: 0x0218, type: Zcl.DataType.UINT8}, + stopMobilePoint1: {ID: 0x0219, type: Zcl.DataType.UINT8}, + startMobilePoint2: {ID: 0x0220, type: Zcl.DataType.UINT8}, + stopMobilePoint2: {ID: 0x0221, type: Zcl.DataType.UINT8}, + startMobilePoint3: {ID: 0x0222, type: Zcl.DataType.UINT8}, + stopMobilePoint3: {ID: 0x0223, type: Zcl.DataType.UINT8}, + relais: {ID: 0x0224, type: Zcl.DataType.UINT16}, + daysNumberCurrentCalendar: {ID: 0x0225, type: Zcl.DataType.UINT8}, + daysNumberNextCalendar: {ID: 0x0226, type: Zcl.DataType.UINT8}, + daysProfileCurrentCalendar: {ID: 0x0227, type: Zcl.DataType.LONG_OCTET_STR}, + daysProfileNextCalendar: {ID: 0x0228, type: Zcl.DataType.LONG_OCTET_STR}, + linkyMode: {ID: 0x0300, type: Zcl.DataType.UINT8}, }, commands: {}, commandsResponse: {}, From c29ecb6adc87bb043088a91a1e950d5ce14d8d5c Mon Sep 17 00:00:00 2001 From: Fairesoimeme Date: Tue, 4 Feb 2025 11:56:05 +0100 Subject: [PATCH 5/6] Update lixee.ts --- src/devices/lixee.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/lixee.ts b/src/devices/lixee.ts index 6e498bc98815f..53d6407f4e90f 100644 --- a/src/devices/lixee.ts +++ b/src/devices/lixee.ts @@ -1836,7 +1836,7 @@ const definitions: DefinitionWithExtend[] = [ return exposes; }, - extend:[local.modernExtend.addCustomClusterManuSpecificLixee()], + extend:[local.modernExtend.addCustomClusterManuSpecificLixee()], options: [ exposes.options.measurement_poll_interval(), e From abb2faeb6be121ea3565009c58d649cefdf1e141 Mon Sep 17 00:00:00 2001 From: Fairesoimeme Date: Wed, 5 Feb 2025 18:52:24 +0100 Subject: [PATCH 6/6] Update lixee.ts --- src/devices/lixee.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/devices/lixee.ts b/src/devices/lixee.ts index 53d6407f4e90f..38e3b9339b938 100644 --- a/src/devices/lixee.ts +++ b/src/devices/lixee.ts @@ -18,7 +18,7 @@ const NS = 'zhc:lixee'; const local = { modernExtend: { addCustomClusterManuSpecificLixee: () => - deviceAddCustomCluster('liXeePrivate', { + deviceAddCustomCluster('liXeeCustom', { ID: 0xff66, manufacturerCode: Zcl.ManufacturerCode.NXP_SEMICONDUCTORS, attributes: { @@ -185,7 +185,7 @@ const fzLocal = { }, } satisfies Fz.Converter, lixee_private_fz: { - cluster: 'liXeePrivate', // 0xFF66 + cluster: 'liXeeCustom', // 0xFF66 type: ['attributeReport', 'readResponse'], convert: (model, msg, publish, options, meta) => { const result: KeyValue = {}; @@ -718,7 +718,7 @@ const linkyPhaseDef = { }; const clustersDef = { - _0xFF66: 'liXeePrivate', // 0xFF66 + _0xFF66: 'liXeeCustom', // 0xFF66 _0x0B04: 'haElectricalMeasurement', // 0x0B04 _0x0702: 'seMetering', // 0x0702 _0x0B01: 'haMeterIdentification', // 0x0B01 @@ -1871,10 +1871,10 @@ const definitions: DefinitionWithExtend[] = [ clustersDef._0x0702 /* seMetering */, clustersDef._0x0B01 /* haMeterIdentification */, clustersDef._0x0B04 /* haElectricalMeasurement */, - clustersDef._0xFF66 /* liXeePrivate */, + clustersDef._0xFF66 /* liXeeCustom */, ]); - await endpoint.read('liXeePrivate', ['linkyMode', 'currentTarif'], {manufacturerCode: null}).catch((e) => { + await endpoint.read('liXeeCustom', ['linkyMode', 'currentTarif'], {manufacturerCode: null}).catch((e) => { // https://github.com/Koenkk/zigbee2mqtt/issues/11674 logger.warning(`Failed to read zigbee attributes: ${e}`, NS); }); @@ -1931,7 +1931,7 @@ const definitions: DefinitionWithExtend[] = [ onEvent: async (type, data, device, options) => { const endpoint = device.getEndpoint(1); if (type === 'start') { - endpoint.read('liXeePrivate', ['linkyMode', 'currentTarif'], {manufacturerCode: null}).catch((e) => { + endpoint.read('liXeeCustom', ['linkyMode', 'currentTarif'], {manufacturerCode: null}).catch((e) => { // https://github.com/Koenkk/zigbee2mqtt/issues/11674 logger.warning(`Failed to read zigbee attributes: ${e}`, NS); });