From 85447fbc839fd5d0b42fc7708c2b61486368b3f8 Mon Sep 17 00:00:00 2001 From: Nerivec <62446222+Nerivec@users.noreply.github.com> Date: Sat, 16 Mar 2024 09:08:40 +0100 Subject: [PATCH] fix: Added non-CSA-assigned manufacturer codes currently used (#976) --- src/zcl/definition/cluster.ts | 12 ++++++------ src/zcl/definition/manufacturerCode.ts | 7 +++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/zcl/definition/cluster.ts b/src/zcl/definition/cluster.ts index 07d06e9dde..9a3c56ddf0 100644 --- a/src/zcl/definition/cluster.ts +++ b/src/zcl/definition/cluster.ts @@ -2564,7 +2564,7 @@ const Cluster: { tolerance: {ID: 3, type: DataType.uint16}, minPercentChange: {ID: 16, type: DataType.unknown}, minAbsoluteChange: {ID: 17, type: DataType.unknown}, - sprutTemperatureOffset: {ID: 0x6600, type: DataType.int16, manufacturerCode: ManufacturerCode.SPRUT_DEVICE}, + sprutTemperatureOffset: {ID: 0x6600, type: DataType.int16, manufacturerCode: ManufacturerCode.CUSTOM_SPRUT_DEVICE}, }, commands: { }, @@ -2609,7 +2609,7 @@ const Cluster: { minMeasuredValue: {ID: 1, type: DataType.uint16}, maxMeasuredValue: {ID: 2, type: DataType.uint16}, tolerance: {ID: 3, type: DataType.uint16}, - sprutHeater: {ID: 0x6600, type: DataType.boolean, manufacturerCode: ManufacturerCode.SPRUT_DEVICE}, + sprutHeater: {ID: 0x6600, type: DataType.boolean, manufacturerCode: ManufacturerCode.CUSTOM_SPRUT_DEVICE}, }, commands: { }, @@ -2631,8 +2631,8 @@ const Cluster: { elkoOccupancyOperationMode: {ID: 0xE001, type: DataType.enum8, manufacturerCode: ManufacturerCode.ADEO}, elkoForceOffTimeout: {ID: 0xE002, type: DataType.uint16, manufacturerCode: ManufacturerCode.ADEO}, elkoOccupancySensitivity: {ID: 0xE003, type: DataType.uint8, manufacturerCode: ManufacturerCode.ADEO}, - sprutOccupancyLevel: {ID: 0x6600, type: DataType.uint16, manufacturerCode: ManufacturerCode.SPRUT_DEVICE}, - sprutOccupancySensitivity: {ID: 0x6601, type: DataType.uint16, manufacturerCode: ManufacturerCode.SPRUT_DEVICE}, + sprutOccupancyLevel: {ID: 0x6600, type: DataType.uint16, manufacturerCode: ManufacturerCode.CUSTOM_SPRUT_DEVICE}, + sprutOccupancySensitivity: {ID: 0x6601, type: DataType.uint16, manufacturerCode: ManufacturerCode.CUSTOM_SPRUT_DEVICE}, }, commands: { }, @@ -2669,8 +2669,8 @@ const Cluster: { measuredValue: {ID: 0, type: DataType.singlePrec}, minMeasuredValue: {ID: 1, type: DataType.singlePrec}, maxMeasuredValue: {ID: 2, type: DataType.singlePrec}, - sprutCO2Calibration: {ID: 0x6600, type: DataType.boolean, manufacturerCode: ManufacturerCode.SPRUT_DEVICE}, - sprutCO2AutoCalibration: {ID: 0x6601, type: DataType.boolean, manufacturerCode: ManufacturerCode.SPRUT_DEVICE}, + sprutCO2Calibration: {ID: 0x6600, type: DataType.boolean, manufacturerCode: ManufacturerCode.CUSTOM_SPRUT_DEVICE}, + sprutCO2AutoCalibration: {ID: 0x6601, type: DataType.boolean, manufacturerCode: ManufacturerCode.CUSTOM_SPRUT_DEVICE}, }, commands: {}, commandsResponse: {}, diff --git a/src/zcl/definition/manufacturerCode.ts b/src/zcl/definition/manufacturerCode.ts index e538354305..8855035891 100644 --- a/src/zcl/definition/manufacturerCode.ts +++ b/src/zcl/definition/manufacturerCode.ts @@ -720,8 +720,11 @@ enum ManufacturerCode { RESERVED_9 = 0xFFFE, RESERVED_10 = 0xFFFF, - // Custom - SPRUT_DEVICE = 0x6666, + // Non-CSA-assigned codes + CUSTOM_PERENIO = 0x007B, + CUSTOM_LIVOLO = 0x1AD2, + CUSTOM_SPRUT_DEVICE = 0x6666, + CUSTOM_LYTKO = 0x7777, }; export default ManufacturerCode;