@matter/model 0.16.0-alpha.0-20251023-bb23617e5 → 0.16.0-alpha.0-20251027-17770fb28

package/src/standard/elements/device-energy-management-cluster.element.ts

@@ -34,36 +34,27 @@ export const DeviceEnergyManagement = Cluster(
         Field({ name: "CON", conformance: "O", constraint: "6", title: "ConstraintBasedAdjustment" })
     ),
 
-    Attribute(
-        { name: "EsaType", id: 0x0, type: "ESATypeEnum", access: "R V", conformance: "M", default: 255, quality: "F" }
-    ),
-    Attribute({ name: "EsaCanGenerate", id: 0x1, type: "bool", access: "R V", conformance: "M", default: false, quality: "F" }),
-    Attribute({
-        name: "EsaState", id: 0x2, type: "ESAStateEnum", access: "R V", conformance: "M",
-        constraint: "desc", default: 0
-    }),
-    Attribute({ name: "AbsMinPower", id: 0x3, type: "power-mW", access: "R V", conformance: "M", default: 0 }),
-    Attribute({
-        name: "AbsMaxPower", id: 0x4, type: "power-mW", access: "R V", conformance: "M",
-        constraint: "min absMinPower", default: 0
-    }),
+    Attribute({ name: "EsaType", id: 0x0, type: "ESATypeEnum", access: "R V", conformance: "M", quality: "F" }),
+    Attribute({ name: "EsaCanGenerate", id: 0x1, type: "bool", access: "R V", conformance: "M", quality: "F" }),
+    Attribute({ name: "EsaState", id: 0x2, type: "ESAStateEnum", access: "R V", conformance: "M", constraint: "desc" }),
+    Attribute({ name: "AbsMinPower", id: 0x3, type: "power-mW", access: "R V", conformance: "M" }),
+    Attribute({ name: "AbsMaxPower", id: 0x4, type: "power-mW", access: "R V", conformance: "M", constraint: "min absMinPower" }),
     Attribute({
         name: "PowerAdjustmentCapability", id: 0x5, type: "PowerAdjustCapabilityStruct", access: "R V",
-        conformance: "PA", default: null, quality: "X Q"
-    }),
-    Attribute({
-        name: "Forecast", id: 0x6, type: "ForecastStruct", access: "R V", conformance: "PFR | SFR",
-        default: null, quality: "X Q"
+        conformance: "PA", quality: "X Q"
     }),
+    Attribute(
+        { name: "Forecast", id: 0x6, type: "ForecastStruct", access: "R V", conformance: "PFR | SFR", quality: "X Q" }
+    ),
     Attribute({
         name: "OptOutState", id: 0x7, type: "OptOutStateEnum", access: "R V",
-        conformance: "PA | STA | PAU | FA | CON", constraint: "desc", default: 0
+        conformance: "PA | STA | PAU | FA | CON", constraint: "desc"
     }),
     Event({ name: "PowerAdjustStart", id: 0x0, access: "V", conformance: "PA", priority: "info" }),
 
     Event(
         { name: "PowerAdjustEnd", id: 0x1, access: "V", conformance: "PA", priority: "info" },
-        Field({ name: "Cause", id: 0x0, type: "CauseEnum", conformance: "M", default: 0 }),
+        Field({ name: "Cause", id: 0x0, type: "CauseEnum", conformance: "M" }),
         Field({ name: "Duration", id: 0x1, type: "elapsed-s", conformance: "M" }),
         Field({ name: "EnergyUse", id: 0x2, type: "energy-mWh", conformance: "M" })
     ),
@@ -71,7 +62,7 @@ export const DeviceEnergyManagement = Cluster(
     Event({ name: "Paused", id: 0x2, access: "V", conformance: "PAU", priority: "info" }),
     Event(
         { name: "Resumed", id: 0x3, access: "V", conformance: "PAU", priority: "info" },
-        Field({ name: "Cause", id: 0x0, type: "CauseEnum", conformance: "M", default: 0 })
+        Field({ name: "Cause", id: 0x0, type: "CauseEnum", conformance: "M" })
     ),
 
     Command(
@@ -210,17 +201,17 @@ export const DeviceEnergyManagement = Cluster(
 
     Datatype(
         { name: "CostStruct", type: "struct" },
-        Field({ name: "CostType", id: 0x0, type: "CostTypeEnum", conformance: "M", default: 0 }),
-        Field({ name: "Value", id: 0x1, type: "int32", conformance: "M", default: 0 }),
-        Field({ name: "DecimalPoints", id: 0x2, type: "uint8", conformance: "M", default: 0 }),
+        Field({ name: "CostType", id: 0x0, type: "CostTypeEnum", conformance: "M" }),
+        Field({ name: "Value", id: 0x1, type: "int32", conformance: "M" }),
+        Field({ name: "DecimalPoints", id: 0x2, type: "uint8", conformance: "M" }),
         Field({ name: "Currency", id: 0x3, type: "uint16", conformance: "O", constraint: "max 999", default: 0 })
     ),
 
     Datatype(
         { name: "PowerAdjustStruct", type: "struct" },
-        Field({ name: "MinPower", id: 0x0, type: "power-mW", conformance: "M", default: 0 }),
-        Field({ name: "MaxPower", id: 0x1, type: "power-mW", conformance: "M", constraint: "min minPower", default: 0 }),
-        Field({ name: "MinDuration", id: 0x2, type: "elapsed-s", conformance: "M", default: 0 }),
+        Field({ name: "MinPower", id: 0x0, type: "power-mW", conformance: "M" }),
+        Field({ name: "MaxPower", id: 0x1, type: "power-mW", conformance: "M", constraint: "min minPower" }),
+        Field({ name: "MinDuration", id: 0x2, type: "elapsed-s", conformance: "M" }),
         Field({ name: "MaxDuration", id: 0x3, type: "elapsed-s", conformance: "M", constraint: "min minDuration" })
     ),
 
@@ -230,18 +221,18 @@ export const DeviceEnergyManagement = Cluster(
         Field(
             {
                 name: "PowerAdjustCapability", id: 0x0, type: "list", conformance: "M", constraint: "max 8",
-                default: null, quality: "X"
+                quality: "X"
             },
             Field({ name: "entry", type: "PowerAdjustStruct" })
         ),
 
-        Field({ name: "Cause", id: 0x1, type: "PowerAdjustReasonEnum", conformance: "M", default: 0 })
+        Field({ name: "Cause", id: 0x1, type: "PowerAdjustReasonEnum", conformance: "M" })
     ),
 
     Datatype(
         { name: "ForecastStruct", type: "struct" },
-        Field({ name: "ForecastId", id: 0x0, type: "uint32", conformance: "M", default: 0 }),
-        Field({ name: "ActiveSlotNumber", id: 0x1, type: "uint16", conformance: "M", default: 0, quality: "X" }),
+        Field({ name: "ForecastId", id: 0x0, type: "uint32", conformance: "M" }),
+        Field({ name: "ActiveSlotNumber", id: 0x1, type: "uint16", conformance: "M", quality: "X" }),
         Field({ name: "StartTime", id: 0x2, type: "epoch-s", conformance: "M" }),
         Field({ name: "EndTime", id: 0x3, type: "epoch-s", conformance: "M" }),
         Field({ name: "EarliestStartTime", id: 0x4, type: "epoch-s", conformance: "STA", quality: "X" }),

package/src/standard/elements/device-energy-management-device.element.ts

@@ -22,11 +22,11 @@ export const DeviceEnergyManagementDt = DeviceType(
 
     Requirement(
         { name: "DeviceEnergyManagement", id: 0x98, conformance: "M", element: "serverCluster" },
-        Requirement({ name: "POWERADJUSTMENT", conformance: "Controllable, ESA.a+", element: "feature" }),
-        Requirement({ name: "STARTTIMEADJUSTMENT", conformance: "Controllable, ESA.a+", element: "feature" }),
-        Requirement({ name: "PAUSABLE", conformance: "Controllable, ESA.a+", element: "feature" }),
-        Requirement({ name: "FORECASTADJUSTMENT", conformance: "Controllable, ESA.a+", element: "feature" }),
-        Requirement({ name: "CONSTRAINTBASEDADJUSTMENT", conformance: "Controllable, ESA.a+", element: "feature" })
+        Requirement({ name: "POWERADJUSTMENT", conformance: "[ControllableESA].a+", element: "feature" }),
+        Requirement({ name: "STARTTIMEADJUSTMENT", conformance: "[ControllableESA].a+", element: "feature" }),
+        Requirement({ name: "PAUSABLE", conformance: "[ControllableESA].a+", element: "feature" }),
+        Requirement({ name: "FORECASTADJUSTMENT", conformance: "[ControllableESA].a+", element: "feature" }),
+        Requirement({ name: "CONSTRAINTBASEDADJUSTMENT", conformance: "[ControllableESA].a+", element: "feature" })
     ),
 
     Requirement(

package/src/standard/elements/diagnostic-logs.element.ts

@@ -16,7 +16,7 @@ import {
 } from "../../elements/index.js";
 
 export const DiagnosticLogs = Cluster(
-    { name: "DiagnosticLogs", id: 0x32 },
+    { name: "DiagnosticLogs", id: 0x32, quality: "K" },
     Attribute({ name: "ClusterRevision", id: 0xfffd, type: "ClusterRevision", default: 1 }),
 
     Command(

package/src/standard/elements/dimmable-light.element.ts

@@ -10,7 +10,7 @@ import { MatterDefinition } from "../MatterDefinition.js";
 import { DeviceTypeElement as DeviceType, RequirementElement as Requirement } from "../../elements/index.js";
 
 export const DimmableLightDt = DeviceType(
-    { name: "DimmableLight", id: 0x101, type: "OnOffLight" },
+    { name: "DimmableLight", id: 0x101 },
     Requirement(
         { name: "Descriptor", id: 0x1d, element: "serverCluster" },
         Requirement({ name: "DeviceTypeList", default: [ { deviceType: 257, revision: 3 } ], element: "attribute" })
@@ -21,8 +21,8 @@ export const DimmableLightDt = DeviceType(
     ),
     Requirement({ name: "Groups", id: 0x4, conformance: "M", element: "serverCluster" }),
     Requirement(
-        { name: "ScenesManagement", id: 0x62, conformance: "P, M", element: "serverCluster" },
-        Requirement({ name: "CopyScene", conformance: "P, M", element: "command" })
+        { name: "ScenesManagement", id: 0x62, conformance: "M", element: "serverCluster" },
+        Requirement({ name: "CopyScene", conformance: "M", element: "command" })
     ),
     Requirement(
         { name: "OnOff", id: 0x6, conformance: "M", element: "serverCluster" },

package/src/standard/elements/dimmable-plug-in-unit.element.ts

@@ -13,7 +13,7 @@ export const DimmablePlugInUnitDt = DeviceType(
     { name: "DimmablePlugInUnit", id: 0x10b },
     Requirement(
         { name: "Descriptor", id: 0x1d, element: "serverCluster" },
-        Requirement({ name: "DeviceTypeList", default: [ { deviceType: 267, revision: 4 } ], element: "attribute" })
+        Requirement({ name: "DeviceTypeList", default: [ { deviceType: 267, revision: 5 } ], element: "attribute" })
     ),
     Requirement(
         { name: "Identify", id: 0x3, conformance: "M", element: "serverCluster" },
@@ -21,8 +21,8 @@ export const DimmablePlugInUnitDt = DeviceType(
     ),
     Requirement({ name: "Groups", id: 0x4, conformance: "M", element: "serverCluster" }),
     Requirement(
-        { name: "ScenesManagement", id: 0x62, conformance: "P, M", element: "serverCluster" },
-        Requirement({ name: "CopyScene", conformance: "P, M", element: "command" })
+        { name: "ScenesManagement", id: 0x62, conformance: "M", element: "serverCluster" },
+        Requirement({ name: "CopyScene", conformance: "M", element: "command" })
     ),
     Requirement(
         { name: "OnOff", id: 0x6, conformance: "M", element: "serverCluster" },

package/src/standard/elements/dimmer-switch.element.ts

@@ -10,7 +10,7 @@ import { MatterDefinition } from "../MatterDefinition.js";
 import { DeviceTypeElement as DeviceType, RequirementElement as Requirement } from "../../elements/index.js";
 
 export const DimmerSwitchDt = DeviceType(
-    { name: "DimmerSwitch", id: 0x104, type: "OnOffLightSwitch" },
+    { name: "DimmerSwitch", id: 0x104 },
     Requirement(
         { name: "Descriptor", id: 0x1d, element: "serverCluster" },
         Requirement({ name: "DeviceTypeList", default: [ { deviceType: 260, revision: 3 } ], element: "attribute" })
@@ -18,7 +18,7 @@ export const DimmerSwitchDt = DeviceType(
     Requirement({ name: "Identify", id: 0x3, conformance: "M", element: "serverCluster" }),
     Requirement({ name: "Identify", id: 0x3, conformance: "M", element: "clientCluster" }),
     Requirement({ name: "Groups", id: 0x4, conformance: "O", element: "clientCluster" }),
-    Requirement({ name: "ScenesManagement", id: 0x62, conformance: "P, O", element: "clientCluster" }),
+    Requirement({ name: "ScenesManagement", id: 0x62, conformance: "O", element: "clientCluster" }),
     Requirement({ name: "OnOff", id: 0x6, conformance: "M", element: "clientCluster" }),
     Requirement({ name: "LevelControl", id: 0x8, conformance: "M", element: "clientCluster" })
 );

package/src/standard/elements/dishwasher.element.ts

@@ -13,7 +13,7 @@ export const DishwasherDt = DeviceType(
     { name: "Dishwasher", id: 0x75 },
     Requirement(
         { name: "Descriptor", id: 0x1d, element: "serverCluster" },
-        Requirement({ name: "DeviceTypeList", default: [ { deviceType: 117, revision: 1 } ], element: "attribute" })
+        Requirement({ name: "DeviceTypeList", default: [ { deviceType: 117, revision: 2 } ], element: "attribute" })
     ),
     Requirement({ name: "Identify", id: 0x3, conformance: "O", element: "serverCluster" }),
     Requirement(
@@ -27,7 +27,10 @@ export const DishwasherDt = DeviceType(
         Requirement({ name: "ONOFF", conformance: "X", element: "feature" })
     ),
     Requirement({ name: "DishwasherAlarm", id: 0x5d, conformance: "O", element: "serverCluster" }),
-    Requirement({ name: "OperationalState", id: 0x60, conformance: "M", element: "serverCluster" })
+    Requirement(
+        { name: "OperationalState", id: 0x60, conformance: "M", element: "serverCluster" },
+        Requirement({ name: "OperationCompletion", conformance: "M", element: "event" })
+    )
 );
 
 MatterDefinition.children.push(DishwasherDt);

package/src/standard/elements/door-lock-cluster.element.ts

@@ -18,7 +18,7 @@ import {
 
 export const DoorLock = Cluster(
     { name: "DoorLock", id: 0x101 },
-    Attribute({ name: "ClusterRevision", id: 0xfffd, type: "ClusterRevision", default: 8 }),
+    Attribute({ name: "ClusterRevision", id: 0xfffd, type: "ClusterRevision", default: 9 }),
 
     Attribute(
         { name: "FeatureMap", id: 0xfffc, type: "FeatureMap" },
@@ -50,29 +50,20 @@ export const DoorLock = Cluster(
     Attribute({ name: "DoorOpenEvents", id: 0x4, type: "uint32", access: "RW VM", conformance: "[DPS]" }),
     Attribute({ name: "DoorClosedEvents", id: 0x5, type: "uint32", access: "RW VM", conformance: "[DPS]" }),
     Attribute({ name: "OpenPeriod", id: 0x6, type: "uint16", access: "RW VM", conformance: "[DPS]" }),
-    Attribute({
-        name: "NumberOfTotalUsersSupported", id: 0x11, type: "uint16", access: "R V", conformance: "USR",
-        default: 0, quality: "F"
-    }),
-    Attribute({
-        name: "NumberOfPinUsersSupported", id: 0x12, type: "uint16", access: "R V", conformance: "PIN",
-        default: 0, quality: "F"
-    }),
-    Attribute({
-        name: "NumberOfRfidUsersSupported", id: 0x13, type: "uint16", access: "R V", conformance: "RID",
-        default: 0, quality: "F"
-    }),
+    Attribute({ name: "NumberOfTotalUsersSupported", id: 0x11, type: "uint16", access: "R V", conformance: "USR", quality: "F" }),
+    Attribute({ name: "NumberOfPinUsersSupported", id: 0x12, type: "uint16", access: "R V", conformance: "PIN", quality: "F" }),
+    Attribute({ name: "NumberOfRfidUsersSupported", id: 0x13, type: "uint16", access: "R V", conformance: "RID", quality: "F" }),
     Attribute({
         name: "NumberOfWeekDaySchedulesSupportedPerUser", id: 0x14, type: "uint8", access: "R V",
-        conformance: "WDSCH", constraint: "max 253", default: 0, quality: "F"
+        conformance: "WDSCH", constraint: "max 253", quality: "F"
     }),
     Attribute({
         name: "NumberOfYearDaySchedulesSupportedPerUser", id: 0x15, type: "uint8", access: "R V",
-        conformance: "YDSCH", constraint: "max 253", default: 0, quality: "F"
+        conformance: "YDSCH", constraint: "max 253", quality: "F"
     }),
     Attribute({
         name: "NumberOfHolidaySchedulesSupported", id: 0x16, type: "uint8", access: "R V",
-        conformance: "HDSCH", constraint: "max 253", default: 0, quality: "F"
+        conformance: "HDSCH", constraint: "max 253", quality: "F"
     }),
     Attribute({ name: "MaxPinCodeLength", id: 0x17, type: "uint8", access: "R V", conformance: "PIN", quality: "F" }),
     Attribute({ name: "MinPinCodeLength", id: 0x18, type: "uint8", access: "R V", conformance: "PIN", quality: "F" }),
@@ -80,11 +71,11 @@ export const DoorLock = Cluster(
     Attribute({ name: "MinRfidCodeLength", id: 0x1a, type: "uint8", access: "R V", conformance: "RID", quality: "F" }),
     Attribute({
         name: "CredentialRulesSupport", id: 0x1b, type: "CredentialRulesBitmap", access: "R V",
-        conformance: "USR", default: 1, quality: "F"
+        conformance: "USR", quality: "F"
     }),
     Attribute({
         name: "NumberOfCredentialsSupportedPerUser", id: 0x1c, type: "uint8", access: "R V",
-        conformance: "USR", default: 0, quality: "F"
+        conformance: "USR", quality: "F"
     }),
     Attribute({
         name: "Language", id: 0x21, type: "string", access: "R[W] VM", conformance: "O",
@@ -101,11 +92,11 @@ export const DoorLock = Cluster(
     }),
     Attribute({
         name: "OperatingMode", id: 0x25, type: "OperatingModeEnum", access: "R[W] VM", conformance: "M",
-        constraint: "desc", default: 0, quality: "P"
+        constraint: "desc", quality: "P"
     }),
     Attribute({
         name: "SupportedOperatingModes", id: 0x26, type: "OperatingModesBitmap", access: "R V",
-        conformance: "M", default: 65526, quality: "F"
+        conformance: "M", quality: "F"
     }),
     Attribute({
         name: "DefaultConfigurationRegister", id: 0x27, type: "ConfigurationRegisterBitmap", access: "R V",
@@ -145,24 +136,20 @@ export const DoorLock = Cluster(
     }),
     Attribute({
         name: "RequirePinForRemoteOperation", id: 0x33, type: "bool", access: "R[W] VA",
-        conformance: "COTA & PIN", default: true, quality: "P"
+        conformance: "COTA & PIN", quality: "P"
     }),
     Attribute({ name: "SecurityLevel", id: 0x34, access: "R V", conformance: "D", default: "0" }),
     Attribute({
         name: "ExpiringUserTimeout", id: 0x35, type: "uint16", access: "R[W] VA", conformance: "[USR]",
         constraint: "1 to 2880", quality: "P"
     }),
-    Attribute({
-        name: "AlarmMask", id: 0x40, type: "AlarmMaskBitmap", access: "RW VA", conformance: "O",
-        default: 65535, quality: "P"
-    }),
     Attribute({
         name: "AliroReaderVerificationKey", id: 0x80, type: "octstr", access: "R A", conformance: "ALIRO",
-        constraint: "65", default: null, quality: "X"
+        constraint: "65", quality: "X"
     }),
     Attribute({
         name: "AliroReaderGroupIdentifier", id: 0x81, type: "octstr", access: "R A", conformance: "ALIRO",
-        constraint: "16", default: null, quality: "X"
+        constraint: "16", quality: "X"
     }),
     Attribute({
         name: "AliroReaderGroupSubIdentifier", id: 0x82, type: "octstr", access: "R A",
@@ -172,35 +159,32 @@ export const DoorLock = Cluster(
     Attribute(
         {
             name: "AliroExpeditedTransactionSupportedProtocolVersions", id: 0x83, type: "list", access: "R A",
-            conformance: "ALIRO", constraint: "max 16[2]", default: [], quality: "F"
+            conformance: "ALIRO", constraint: "max 16[2]", quality: "F"
         },
         Field({ name: "entry", type: "octstr" })
     ),
 
     Attribute({
         name: "AliroGroupResolvingKey", id: 0x84, type: "octstr", access: "R A", conformance: "ALBU",
-        constraint: "16", default: null, quality: "X"
+        constraint: "16", quality: "X"
     }),
 
     Attribute(
         {
             name: "AliroSupportedBleuwbProtocolVersions", id: 0x85, type: "list", access: "R A",
-            conformance: "ALBU", constraint: "max 16[2]", default: [], quality: "F"
+            conformance: "ALBU", constraint: "max 16[2]", quality: "F"
         },
         Field({ name: "entry", type: "octstr" })
     ),
 
-    Attribute({
-        name: "AliroBleAdvertisingVersion", id: 0x86, type: "uint8", access: "R A", conformance: "ALBU",
-        default: 0, quality: "F"
-    }),
+    Attribute({ name: "AliroBleAdvertisingVersion", id: 0x86, type: "uint8", access: "R A", conformance: "ALBU", quality: "F" }),
     Attribute({
         name: "NumberOfAliroCredentialIssuerKeysSupported", id: 0x87, type: "uint16", access: "R V",
-        conformance: "ALIRO", default: 0, quality: "F"
+        conformance: "ALIRO", quality: "F"
     }),
     Attribute({
         name: "NumberOfAliroEndpointKeysSupported", id: 0x88, type: "uint16", access: "R V",
-        conformance: "ALIRO", default: 0, quality: "F"
+        conformance: "ALIRO", quality: "F"
     }),
     Event(
         { name: "DoorLockAlarm", id: 0x0, access: "V", conformance: "M", priority: "critical" },
@@ -285,11 +269,8 @@ export const DoorLock = Cluster(
             response: "status"
         },
         Field({ name: "UserId", id: 0x0, type: "uint16", conformance: "M", constraint: "desc" }),
-        Field({
-            name: "UserStatus", id: 0x1, type: "UserStatusEnum", conformance: "M", constraint: "desc",
-            default: 1, quality: "X"
-        }),
-        Field({ name: "UserType", id: 0x2, type: "UserTypeEnum", conformance: "M", default: 0, quality: "X" }),
+        Field({ name: "UserStatus", id: 0x1, type: "UserStatusEnum", conformance: "M", constraint: "desc", quality: "X" }),
+        Field({ name: "UserType", id: 0x2, type: "UserTypeEnum", conformance: "M", quality: "X" }),
         Field({ name: "Pin", id: 0x3, type: "octstr", conformance: "M" })
     ),
 
@@ -304,10 +285,7 @@ export const DoorLock = Cluster(
     Command(
         { name: "GetPinCodeResponse", id: 0x6, conformance: "!USR & PIN", direction: "response" },
         Field({ name: "UserId", id: 0x0, type: "uint16", conformance: "M", constraint: "desc" }),
-        Field({
-            name: "UserStatus", id: 0x1, type: "UserStatusEnum", conformance: "M", constraint: "desc",
-            default: 0, quality: "X"
-        }),
+        Field({ name: "UserStatus", id: 0x1, type: "UserStatusEnum", conformance: "M", constraint: "desc", quality: "X" }),
         Field({ name: "UserType", id: 0x2, type: "UserTypeEnum", conformance: "M", constraint: "desc", quality: "X" }),
         Field({ name: "PinCode", id: 0x3, type: "octstr", conformance: "M", quality: "X" })
     ),
@@ -396,7 +374,7 @@ export const DoorLock = Cluster(
             name: "UserIndex", id: 0x1, type: "uint16", conformance: "M",
             constraint: "1 to numberOfTotalUsersSupported"
         }),
-        Field({ name: "Status", id: 0x2, type: "status", conformance: "M", constraint: "desc", default: 0 }),
+        Field({ name: "Status", id: 0x2, type: "status", conformance: "M", constraint: "desc" }),
         Field({ name: "DaysMask", id: 0x3, type: "DaysMaskBitmap", conformance: "O" }),
         Field({ name: "StartHour", id: 0x4, type: "uint8", conformance: "O", constraint: "max 23" }),
         Field({ name: "StartMinute", id: 0x5, type: "uint8", conformance: "O", constraint: "max 59" }),
@@ -461,7 +439,7 @@ export const DoorLock = Cluster(
             name: "UserIndex", id: 0x1, type: "uint16", conformance: "M",
             constraint: "1 to numberOfTotalUsersSupported"
         }),
-        Field({ name: "Status", id: 0x2, type: "status", conformance: "M", constraint: "desc", default: 0 }),
+        Field({ name: "Status", id: 0x2, type: "status", conformance: "M", constraint: "desc" }),
         Field({ name: "LocalStartTime", id: 0x3, type: "epoch-s", conformance: "O" }),
         Field({ name: "LocalEndTime", id: 0x4, type: "epoch-s", conformance: "O" })
     ),
@@ -512,7 +490,7 @@ export const DoorLock = Cluster(
             name: "HolidayIndex", id: 0x0, type: "uint8", conformance: "M",
             constraint: "1 to numberOfHolidaySchedulesSupported"
         }),
-        Field({ name: "Status", id: 0x1, type: "status", conformance: "M", constraint: "desc", default: 0 }),
+        Field({ name: "Status", id: 0x1, type: "status", conformance: "M", constraint: "desc" }),
         Field({ name: "LocalStartTime", id: 0x2, type: "epoch-s", conformance: "O", quality: "X" }),
         Field({ name: "LocalEndTime", id: 0x3, type: "epoch-s", conformance: "O", quality: "X" }),
         Field({ name: "OperatingMode", id: 0x4, type: "OperatingModeEnum", conformance: "O", quality: "X" })
@@ -558,14 +536,8 @@ export const DoorLock = Cluster(
             response: "status"
         },
         Field({ name: "UserId", id: 0x0, type: "uint16", conformance: "M", constraint: "desc" }),
-        Field({
-            name: "UserStatus", id: 0x1, type: "UserStatusEnum", conformance: "M", constraint: "desc",
-            default: 1, quality: "X"
-        }),
-        Field({
-            name: "UserType", id: 0x2, type: "UserTypeEnum", conformance: "M", constraint: "desc", default: 0,
-            quality: "X"
-        }),
+        Field({ name: "UserStatus", id: 0x1, type: "UserStatusEnum", conformance: "M", constraint: "desc", quality: "X" }),
+        Field({ name: "UserType", id: 0x2, type: "UserTypeEnum", conformance: "M", constraint: "desc", quality: "X" }),
         Field({ name: "RfidCode", id: 0x3, type: "octstr", conformance: "M" })
     ),
 
@@ -580,10 +552,7 @@ export const DoorLock = Cluster(
     Command(
         { name: "GetRfidCodeResponse", id: 0x17, conformance: "!USR & RID", direction: "response" },
         Field({ name: "UserId", id: 0x0, type: "uint16", conformance: "M", constraint: "desc" }),
-        Field({
-            name: "UserStatus", id: 0x1, type: "UserStatusEnum", conformance: "M", constraint: "desc",
-            default: 0, quality: "X"
-        }),
+        Field({ name: "UserStatus", id: 0x1, type: "UserStatusEnum", conformance: "M", constraint: "desc", quality: "X" }),
         Field({ name: "UserType", id: 0x2, type: "UserTypeEnum", conformance: "M", constraint: "desc", quality: "X" }),
         Field({ name: "RfidCode", id: 0x3, type: "octstr", conformance: "M", quality: "X" })
     ),
@@ -612,17 +581,17 @@ export const DoorLock = Cluster(
             constraint: "1 to numberOfTotalUsersSupported"
         }),
         Field({ name: "UserName", id: 0x2, type: "string", conformance: "M", constraint: "max 10", quality: "X" }),
-        Field({ name: "UserUniqueId", id: 0x3, type: "uint32", conformance: "M", default: 4294967295, quality: "X" }),
+        Field({ name: "UserUniqueId", id: 0x3, type: "uint32", conformance: "M", quality: "X" }),
         Field({
             name: "UserStatus", id: 0x4, type: "UserStatusEnum", conformance: "M",
-            constraint: "occupiedEnabled, occupiedDisabled", default: 1, quality: "X"
+            constraint: "occupiedEnabled, occupiedDisabled", quality: "X"
         }),
         Field({
             name: "UserType", id: 0x5, type: "UserTypeEnum", conformance: "M",
             constraint: "unrestrictedUser, nonAccessUser, forcedUser, disposableUser, expiringUser, scheduleRestrictedUser, remoteOnlyUser",
-            default: 0, quality: "X"
+            quality: "X"
         }),
-        Field({ name: "CredentialRule", id: 0x6, type: "CredentialRuleEnum", conformance: "M", default: 0, quality: "X" })
+        Field({ name: "CredentialRule", id: 0x6, type: "CredentialRuleEnum", conformance: "M", quality: "X" })
     ),
 
     Command(
@@ -643,12 +612,12 @@ export const DoorLock = Cluster(
             constraint: "1 to numberOfTotalUsersSupported"
         }),
         Field({ name: "UserName", id: 0x1, type: "string", conformance: "M", constraint: "max 10", quality: "X" }),
-        Field({ name: "UserUniqueId", id: 0x2, type: "uint32", conformance: "M", default: 0, quality: "X" }),
-        Field({ name: "UserStatus", id: 0x3, type: "UserStatusEnum", conformance: "M", default: 0, quality: "X" }),
-        Field({ name: "UserType", id: 0x4, type: "UserTypeEnum", conformance: "M", default: 0, quality: "X" }),
+        Field({ name: "UserUniqueId", id: 0x2, type: "uint32", conformance: "M", quality: "X" }),
+        Field({ name: "UserStatus", id: 0x3, type: "UserStatusEnum", conformance: "M", quality: "X" }),
+        Field({ name: "UserType", id: 0x4, type: "UserTypeEnum", conformance: "M", quality: "X" }),
         Field({
             name: "CredentialRule", id: 0x5, type: "CredentialRuleEnum", conformance: "M", constraint: "desc",
-            default: 0, quality: "X"
+            quality: "X"
         }),
 
         Field(
@@ -689,12 +658,12 @@ export const DoorLock = Cluster(
         }),
         Field({
             name: "UserStatus", id: 0x4, type: "UserStatusEnum", conformance: "M",
-            constraint: "occupiedEnabled, occupiedDisabled", default: 1, quality: "X"
+            constraint: "occupiedEnabled, occupiedDisabled", quality: "X"
         }),
         Field({
             name: "UserType", id: 0x5, type: "UserTypeEnum", conformance: "M",
             constraint: "unrestrictedUser, programmingUser, nonAccessUser, forcedUser, disposableUser, expiringUser, remoteOnlyUser",
-            default: 0, quality: "X"
+            quality: "X"
         })
     ),
 
@@ -703,7 +672,7 @@ export const DoorLock = Cluster(
         Field({ name: "Status", id: 0x0, type: "status", conformance: "M", constraint: "desc" }),
         Field({
             name: "UserIndex", id: 0x1, type: "uint16", conformance: "M",
-            constraint: "1 to numberOfTotalUsersSupported", default: 0, quality: "X"
+            constraint: "1 to numberOfTotalUsersSupported", quality: "X"
         }),
         Field({ name: "NextCredentialIndex", id: 0x2, type: "uint16", conformance: "O", constraint: "desc", quality: "X" })
     ),
@@ -993,7 +962,7 @@ export const DoorLock = Cluster(
     Datatype(
         { name: "CredentialStruct", type: "struct" },
         Field({ name: "CredentialType", id: 0x0, type: "CredentialTypeEnum", conformance: "M" }),
-        Field({ name: "CredentialIndex", id: 0x1, type: "uint16", conformance: "M", default: 0 })
+        Field({ name: "CredentialIndex", id: 0x1, type: "uint16", conformance: "M" })
     ),
     Datatype(
         { name: "StatusCodeEnum", type: "enum8" },

package/src/standard/elements/door-lock-controller.element.ts

@@ -16,7 +16,7 @@ export const DoorLockControllerDt = DeviceType(
         Requirement({ name: "DeviceTypeList", default: [ { deviceType: 11, revision: 3 } ], element: "attribute" })
     ),
     Requirement({ name: "Groups", id: 0x4, conformance: "O", element: "clientCluster" }),
-    Requirement({ name: "ScenesManagement", id: 0x62, conformance: "P, O", element: "clientCluster" }),
+    Requirement({ name: "ScenesManagement", id: 0x62, conformance: "O", element: "clientCluster" }),
     Requirement({ name: "TimeSynchronization", id: 0x38, conformance: "O", element: "serverCluster" }),
     Requirement({ name: "DoorLock", id: 0x101, conformance: "M", element: "clientCluster" })
 );

package/src/standard/elements/door-lock-device.element.ts

@@ -18,12 +18,10 @@ export const DoorLockDt = DeviceType(
     Requirement({ name: "Identify", id: 0x3, conformance: "M", element: "serverCluster" }),
     Requirement({ name: "Groups", id: 0x4, conformance: "X", element: "serverCluster" }),
     Requirement({ name: "ScenesManagement", id: 0x62, conformance: "X", element: "serverCluster" }),
-
     Requirement(
         { name: "DoorLock", id: 0x101, conformance: "M", element: "serverCluster" },
-        Requirement({ name: "USER", conformance: "Matter & (PIN | RID | FPG | FACE | ALIRO)", element: "feature" }),
-        Requirement({ name: "RFIDCREDENTIAL", conformance: "P, O", element: "feature" }),
-        Requirement({ name: "AlarmMask", conformance: "[Alarms]", element: "attribute" })
+        Requirement({ name: "USER", conformance: "PIN | RID | FGP | FACE | ALIRO", element: "feature" }),
+        Requirement({ name: "RFIDCREDENTIAL", conformance: "P, O", element: "feature" })
     )
 );
 

package/src/standard/elements/ecosystem-information.element.ts

@@ -25,11 +25,16 @@ export const EcosystemInformation = Cluster(
         { name: "LocationDirectory", id: 0x1, type: "list", access: "R F M", conformance: "M", quality: "N" },
         Field({ name: "entry", type: "EcosystemLocationStruct" })
     ),
+    Datatype(
+        { name: "DeviceTypeStruct", type: "struct" },
+        Field({ name: "DeviceType", id: 0x0, type: "devtype-id", conformance: "M" }),
+        Field({ name: "Revision", id: 0x1, type: "uint16", conformance: "M", constraint: "min 1" })
+    ),
 
     Datatype(
         { name: "EcosystemDeviceStruct", type: "struct" },
         Field({ name: "DeviceName", id: 0x0, type: "string", access: "S", conformance: "O", constraint: "max 64" }),
-        Field({ name: "DeviceNameLastEdit", id: 0x1, type: "epoch-us", access: "S", conformance: "desc", default: 0 }),
+        Field({ name: "DeviceNameLastEdit", id: 0x1, type: "epoch-us", access: "S", conformance: "DeviceName", default: 0 }),
         Field({ name: "BridgedEndpoint", id: 0x2, type: "endpoint-no", access: "S", conformance: "desc", constraint: "desc" }),
         Field({
             name: "OriginalEndpoint", id: 0x3, type: "endpoint-no", access: "S", conformance: "desc",
@@ -37,7 +42,7 @@ export const EcosystemInformation = Cluster(
         }),
         Field(
             { name: "DeviceTypes", id: 0x4, type: "list", access: "S", conformance: "M", constraint: "desc" },
-            Field({ name: "entry", type: "Descriptor.DeviceTypeStruct" })
+            Field({ name: "entry", type: "DeviceTypeStruct" })
         ),
 
         Field(

package/src/standard/elements/electrical-energy-measurement.element.ts

@@ -32,19 +32,19 @@ export const ElectricalEnergyMeasurement = Cluster(
     ),
     Attribute({
         name: "CumulativeEnergyImported", id: 0x1, type: "EnergyMeasurementStruct", access: "R V",
-        conformance: "IMPE & CUME", default: null, quality: "X Q"
+        conformance: "IMPE & CUME", quality: "X Q"
     }),
     Attribute({
         name: "CumulativeEnergyExported", id: 0x2, type: "EnergyMeasurementStruct", access: "R V",
-        conformance: "EXPE & CUME", default: null, quality: "X Q"
+        conformance: "EXPE & CUME", quality: "X Q"
     }),
     Attribute({
         name: "PeriodicEnergyImported", id: 0x3, type: "EnergyMeasurementStruct", access: "R V",
-        conformance: "IMPE & PERE", default: null, quality: "X Q"
+        conformance: "IMPE & PERE", quality: "X Q"
     }),
     Attribute({
         name: "PeriodicEnergyExported", id: 0x4, type: "EnergyMeasurementStruct", access: "R V",
-        conformance: "EXPE & PERE", default: null, quality: "X Q"
+        conformance: "EXPE & PERE", quality: "X Q"
     }),
     Attribute({
         name: "CumulativeEnergyReset", id: 0x5, type: "CumulativeEnergyResetStruct", access: "R V",
@@ -61,6 +61,27 @@ export const ElectricalEnergyMeasurement = Cluster(
         Field({ name: "EnergyExported", id: 0x1, type: "EnergyMeasurementStruct", conformance: "PERE & EXPE" })
     ),
 
+    Datatype(
+        { name: "MeasurementTypeEnum", type: "enum16" },
+        Field({ name: "Unspecified", id: 0x0, conformance: "M" }),
+        Field({ name: "Voltage", id: 0x1, conformance: "M" }),
+        Field({ name: "ActiveCurrent", id: 0x2, conformance: "M" }),
+        Field({ name: "ReactiveCurrent", id: 0x3, conformance: "M" }),
+        Field({ name: "ApparentCurrent", id: 0x4, conformance: "M" }),
+        Field({ name: "ActivePower", id: 0x5, conformance: "M" }),
+        Field({ name: "ReactivePower", id: 0x6, conformance: "M" }),
+        Field({ name: "ApparentPower", id: 0x7, conformance: "M" }),
+        Field({ name: "RmsVoltage", id: 0x8, conformance: "M" }),
+        Field({ name: "RmsCurrent", id: 0x9, conformance: "M" }),
+        Field({ name: "RmsPower", id: 0xa, conformance: "M" }),
+        Field({ name: "Frequency", id: 0xb, conformance: "M" }),
+        Field({ name: "PowerFactor", id: 0xc, conformance: "M" }),
+        Field({ name: "NeutralCurrent", id: 0xd, conformance: "M" }),
+        Field({ name: "ElectricalEnergy", id: 0xe, conformance: "M" }),
+        Field({ name: "ReactiveEnergy", id: 0xf, conformance: "M" }),
+        Field({ name: "ApparentEnergy", id: 0x10, conformance: "M" })
+    ),
+
     Datatype(
         { name: "EnergyMeasurementStruct", type: "struct" },
         Field({ name: "Energy", id: 0x0, type: "energy-mWh", conformance: "M", constraint: "min 0" }),