diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 03cc40d944ee34..3bedf93145bbea 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -780,7 +780,7 @@ server cluster PowerSourceConfiguration = 46 { } server cluster PowerSource = 47 { - enum BatChargeFaultType : ENUM8 { + enum BatChargeFault : ENUM8 { kUnspecfied = 0; kAmbientTooHot = 1; kAmbientTooCold = 2; @@ -807,7 +807,7 @@ server cluster PowerSource = 47 { kIsNotCharging = 3; } - enum BatFaultType : ENUM8 { + enum BatFault : ENUM8 { kUnspecfied = 0; kOverTemp = 1; kUnderTemp = 2; @@ -832,7 +832,7 @@ server cluster PowerSource = 47 { kDc = 1; } - enum WiredFaultType : ENUM8 { + enum WiredFault : ENUM8 { kUnspecfied = 0; kOverVoltage = 1; kUnderVoltage = 2; @@ -845,12 +845,12 @@ server cluster PowerSource = 47 { kReplaceable = 0x8; } - readonly attribute enum8 status = 0; + readonly attribute PowerSourceStatus status = 0; readonly attribute int8u order = 1; readonly attribute char_string<60> description = 2; - readonly attribute enum8 batteryChargeLevel = 14; - readonly attribute boolean batteryReplacementNeeded = 15; - readonly attribute enum8 batteryReplaceability = 16; + readonly attribute BatChargeLevel batChargeLevel = 14; + readonly attribute boolean batReplacementNeeded = 15; + readonly attribute BatReplaceability batReplaceability = 16; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; } @@ -3917,9 +3917,9 @@ endpoint 0 { ram attribute status; ram attribute order default = 3; ram attribute description default = "B1"; - ram attribute batteryChargeLevel; - ram attribute batteryReplacementNeeded; - ram attribute batteryReplaceability; + ram attribute batChargeLevel; + ram attribute batReplacementNeeded; + ram attribute batReplaceability; ram attribute featureMap default = 2; ram attribute clusterRevision default = 1; } @@ -4223,9 +4223,9 @@ endpoint 1 { ram attribute status; ram attribute order default = 2; ram attribute description default = "B2"; - ram attribute batteryChargeLevel; - ram attribute batteryReplacementNeeded; - ram attribute batteryReplaceability; + ram attribute batChargeLevel; + ram attribute batReplacementNeeded; + ram attribute batReplaceability; ram attribute featureMap default = 2; ram attribute clusterRevision default = 1; } @@ -4745,9 +4745,9 @@ endpoint 2 { ram attribute status; ram attribute order default = 1; ram attribute description default = "B3"; - ram attribute batteryChargeLevel; - ram attribute batteryReplacementNeeded; - ram attribute batteryReplaceability; + ram attribute batChargeLevel; + ram attribute batReplacementNeeded; + ram attribute batReplaceability; ram attribute featureMap default = 2; ram attribute clusterRevision default = 1; } diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index f0d147522ad94e..eb3ec315b55416 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 71, + "featureLevel": 72, "creator": "zap", "keyValuePairs": [ { @@ -16,17 +16,17 @@ } ], "package": [ - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json", - "version": "ZCL Test Data", - "type": "zcl-properties" - }, { "pathRelativity": "relativeToZap", "path": "../../../src/app/zap-templates/app-templates.json", "version": "chip-v1", "type": "gen-templates-json" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json", + "version": "ZCL Test Data", + "type": "zcl-properties" } ], "endpointTypes": [ @@ -2219,7 +2219,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "PowerSourceStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2299,7 +2299,7 @@ "code": 5, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "WiredCurrentType", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -2391,7 +2391,7 @@ "reportableChange": 0 }, { - "name": "BatteryVoltage", + "name": "BatVoltage", "code": 11, "mfgCode": null, "side": "server", @@ -2407,7 +2407,7 @@ "reportableChange": 0 }, { - "name": "BatteryPercentRemaining", + "name": "BatPercentRemaining", "code": 12, "mfgCode": null, "side": "server", @@ -2423,7 +2423,7 @@ "reportableChange": 0 }, { - "name": "BatteryTimeRemaining", + "name": "BatTimeRemaining", "code": 13, "mfgCode": null, "side": "server", @@ -2439,11 +2439,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeLevel", + "name": "BatChargeLevel", "code": 14, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeLevel", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2455,7 +2455,7 @@ "reportableChange": 0 }, { - "name": "BatteryReplacementNeeded", + "name": "BatReplacementNeeded", "code": 15, "mfgCode": null, "side": "server", @@ -2471,11 +2471,11 @@ "reportableChange": 0 }, { - "name": "BatteryReplaceability", + "name": "BatReplaceability", "code": 16, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatReplaceability", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2487,7 +2487,7 @@ "reportableChange": 0 }, { - "name": "BatteryPresent", + "name": "BatPresent", "code": 17, "mfgCode": null, "side": "server", @@ -2503,7 +2503,7 @@ "reportableChange": 0 }, { - "name": "ActiveBatteryFaults", + "name": "ActiveBatFaults", "code": 18, "mfgCode": null, "side": "server", @@ -2519,7 +2519,7 @@ "reportableChange": 0 }, { - "name": "BatteryReplacementDescription", + "name": "BatReplacementDescription", "code": 19, "mfgCode": null, "side": "server", @@ -2535,7 +2535,7 @@ "reportableChange": 0 }, { - "name": "BatteryCommonDesignation", + "name": "BatCommonDesignation", "code": 20, "mfgCode": null, "side": "server", @@ -2551,7 +2551,7 @@ "reportableChange": 0 }, { - "name": "BatteryANSIDesignation", + "name": "BatANSIDesignation", "code": 21, "mfgCode": null, "side": "server", @@ -2567,7 +2567,7 @@ "reportableChange": 0 }, { - "name": "BatteryIECDesignation", + "name": "BatIECDesignation", "code": 22, "mfgCode": null, "side": "server", @@ -2583,7 +2583,7 @@ "reportableChange": 0 }, { - "name": "BatteryApprovedChemistry", + "name": "BatApprovedChemistry", "code": 23, "mfgCode": null, "side": "server", @@ -2599,7 +2599,7 @@ "reportableChange": 0 }, { - "name": "BatteryCapacity", + "name": "BatCapacity", "code": 24, "mfgCode": null, "side": "server", @@ -2615,7 +2615,7 @@ "reportableChange": 0 }, { - "name": "BatteryQuantity", + "name": "BatQuantity", "code": 25, "mfgCode": null, "side": "server", @@ -2631,11 +2631,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeState", + "name": "BatChargeState", "code": 26, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeState", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -2647,7 +2647,7 @@ "reportableChange": 0 }, { - "name": "BatteryTimeToFullCharge", + "name": "BatTimeToFullCharge", "code": 27, "mfgCode": null, "side": "server", @@ -2663,7 +2663,7 @@ "reportableChange": 0 }, { - "name": "BatteryFunctionalWhileCharging", + "name": "BatFunctionalWhileCharging", "code": 28, "mfgCode": null, "side": "server", @@ -2679,7 +2679,7 @@ "reportableChange": 0 }, { - "name": "BatteryChargingCurrent", + "name": "BatChargingCurrent", "code": 29, "mfgCode": null, "side": "server", @@ -2695,7 +2695,7 @@ "reportableChange": 0 }, { - "name": "ActiveBatteryChargeFaults", + "name": "ActiveBatChargeFaults", "code": 30, "mfgCode": null, "side": "server", @@ -8106,166 +8106,6 @@ } ] }, - { - "name": "IAS Zone", - "code": 1280, - "mfgCode": null, - "define": "IAS_ZONE_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "ZoneEnrollResponse", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "IAS Zone", - "code": 1280, - "mfgCode": null, - "define": "IAS_ZONE_CLUSTER", - "side": "server", - "enabled": 0, - "commands": [ - { - "name": "ZoneStatusChangeNotification", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "ZoneEnrollRequest", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "zone state", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "enum8", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "zone type", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "enum16", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "zone status", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "IAS CIE address", - "code": 16, - "mfgCode": null, - "side": "server", - "type": "node_id", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "Zone ID", - "code": 17, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xff", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, { "name": "Test Cluster", "code": 4294048773, @@ -11018,7 +10858,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "PowerSourceStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11098,7 +10938,7 @@ "code": 5, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "WiredCurrentType", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -11190,7 +11030,7 @@ "reportableChange": 0 }, { - "name": "BatteryVoltage", + "name": "BatVoltage", "code": 11, "mfgCode": null, "side": "server", @@ -11206,7 +11046,7 @@ "reportableChange": 0 }, { - "name": "BatteryPercentRemaining", + "name": "BatPercentRemaining", "code": 12, "mfgCode": null, "side": "server", @@ -11222,7 +11062,7 @@ "reportableChange": 0 }, { - "name": "BatteryTimeRemaining", + "name": "BatTimeRemaining", "code": 13, "mfgCode": null, "side": "server", @@ -11238,11 +11078,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeLevel", + "name": "BatChargeLevel", "code": 14, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeLevel", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11254,7 +11094,7 @@ "reportableChange": 0 }, { - "name": "BatteryReplacementNeeded", + "name": "BatReplacementNeeded", "code": 15, "mfgCode": null, "side": "server", @@ -11270,11 +11110,11 @@ "reportableChange": 0 }, { - "name": "BatteryReplaceability", + "name": "BatReplaceability", "code": 16, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatReplaceability", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11286,7 +11126,7 @@ "reportableChange": 0 }, { - "name": "BatteryPresent", + "name": "BatPresent", "code": 17, "mfgCode": null, "side": "server", @@ -11302,7 +11142,7 @@ "reportableChange": 0 }, { - "name": "ActiveBatteryFaults", + "name": "ActiveBatFaults", "code": 18, "mfgCode": null, "side": "server", @@ -11318,7 +11158,7 @@ "reportableChange": 0 }, { - "name": "BatteryReplacementDescription", + "name": "BatReplacementDescription", "code": 19, "mfgCode": null, "side": "server", @@ -11334,7 +11174,7 @@ "reportableChange": 0 }, { - "name": "BatteryCommonDesignation", + "name": "BatCommonDesignation", "code": 20, "mfgCode": null, "side": "server", @@ -11350,7 +11190,7 @@ "reportableChange": 0 }, { - "name": "BatteryANSIDesignation", + "name": "BatANSIDesignation", "code": 21, "mfgCode": null, "side": "server", @@ -11366,7 +11206,7 @@ "reportableChange": 0 }, { - "name": "BatteryIECDesignation", + "name": "BatIECDesignation", "code": 22, "mfgCode": null, "side": "server", @@ -11382,7 +11222,7 @@ "reportableChange": 0 }, { - "name": "BatteryApprovedChemistry", + "name": "BatApprovedChemistry", "code": 23, "mfgCode": null, "side": "server", @@ -11398,7 +11238,7 @@ "reportableChange": 0 }, { - "name": "BatteryCapacity", + "name": "BatCapacity", "code": 24, "mfgCode": null, "side": "server", @@ -11414,7 +11254,7 @@ "reportableChange": 0 }, { - "name": "BatteryQuantity", + "name": "BatQuantity", "code": 25, "mfgCode": null, "side": "server", @@ -11430,11 +11270,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeState", + "name": "BatChargeState", "code": 26, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeState", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -11446,7 +11286,7 @@ "reportableChange": 0 }, { - "name": "BatteryTimeToFullCharge", + "name": "BatTimeToFullCharge", "code": 27, "mfgCode": null, "side": "server", @@ -11462,7 +11302,7 @@ "reportableChange": 0 }, { - "name": "BatteryFunctionalWhileCharging", + "name": "BatFunctionalWhileCharging", "code": 28, "mfgCode": null, "side": "server", @@ -11478,7 +11318,7 @@ "reportableChange": 0 }, { - "name": "BatteryChargingCurrent", + "name": "BatChargingCurrent", "code": 29, "mfgCode": null, "side": "server", @@ -11494,7 +11334,7 @@ "reportableChange": 0 }, { - "name": "ActiveBatteryChargeFaults", + "name": "ActiveBatChargeFaults", "code": 30, "mfgCode": null, "side": "server", @@ -13773,7 +13613,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OperationalStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -13949,7 +13789,7 @@ "code": 26, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "SafetyStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -17366,22 +17206,13 @@ ] }, { - "name": "IAS Zone", - "code": 1280, + "name": "Wake on LAN", + "code": 1283, "mfgCode": null, - "define": "IAS_ZONE_CLUSTER", + "define": "WAKE_ON_LAN_CLUSTER", "side": "client", "enabled": 0, - "commands": [ - { - "name": "ZoneEnrollResponse", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "ClusterRevision", @@ -17393,7 +17224,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "2", + "defaultValue": "1", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -17402,256 +17233,89 @@ ] }, { - "name": "IAS Zone", - "code": 1280, + "name": "Wake on LAN", + "code": 1283, "mfgCode": null, - "define": "IAS_ZONE_CLUSTER", + "define": "WAKE_ON_LAN_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "ZoneStatusChangeNotification", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "ZoneEnrollRequest", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { - "name": "zone state", + "name": "MACAddress", "code": 0, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x00", + "defaultValue": "", "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 }, { - "name": "zone type", - "code": 1, + "name": "GeneratedCommandList", + "code": 65528, "mfgCode": null, "side": "server", - "type": "enum16", - "included": 1, - "storageOption": "RAM", + "type": "array", + "included": 0, + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "zone status", - "code": 2, + "name": "AcceptedCommandList", + "code": 65529, "mfgCode": null, "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "RAM", + "type": "array", + "included": 0, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x0000", + "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "IAS CIE address", - "code": 16, + "name": "AttributeList", + "code": 65531, "mfgCode": null, "side": "server", - "type": "node_id", - "included": 1, - "storageOption": "RAM", + "type": "array", + "included": 0, + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "Zone ID", - "code": 17, + "name": "FeatureMap", + "code": 65532, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0xff", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Wake on LAN", - "code": 1283, - "mfgCode": null, - "define": "WAKE_ON_LAN_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Wake on LAN", - "code": 1283, - "mfgCode": null, - "define": "WAKE_ON_LAN_CLUSTER", - "side": "server", - "enabled": 1, - "commands": [], - "attributes": [ - { - "name": "MACAddress", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "GeneratedCommandList", - "code": 65528, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 0, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AcceptedCommandList", - "code": 65529, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 0, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 0, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -19170,48 +18834,294 @@ ] }, { - "name": "Test Cluster", - "code": 4294048773, + "name": "Electrical Measurement", + "code": 2820, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "ELECTRICAL_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, - "commands": [ + "commands": [], + "attributes": [ { - "name": "Test", + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "client", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "3", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + } + ] + }, + { + "name": "Electrical Measurement", + "code": 2820, + "mfgCode": null, + "define": "ELECTRICAL_MEASUREMENT_CLUSTER", + "side": "server", + "enabled": 1, + "commands": [], + "attributes": [ + { + "name": "measurement type", "code": 0, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 + "side": "server", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x000000", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 }, { - "name": "TestNotHandled", - "code": 1, + "name": "total active power", + "code": 772, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 + "side": "server", + "type": "int32s", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x000000", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 }, { - "name": "TestSpecific", - "code": 2, + "name": "rms voltage", + "code": 1285, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xffff", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 }, { - "name": "TestAddArguments", - "code": 4, + "name": "rms voltage min", + "code": 1286, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x8000", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 }, { - "name": "TestStructArgumentRequest", - "code": 7, + "name": "rms voltage max", + "code": 1287, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x8000", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "rms current", + "code": 1288, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xffff", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "rms current min", + "code": 1289, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xffff", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "rms current max", + "code": 1290, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xffff", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "active power", + "code": 1291, + "mfgCode": null, + "side": "server", + "type": "int16s", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xffff", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "active power min", + "code": 1292, + "mfgCode": null, + "side": "server", + "type": "int16s", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xffff", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "active power max", + "code": 1293, + "mfgCode": null, + "side": "server", + "type": "int16s", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xffff", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "3", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + } + ] + }, + { + "name": "Test Cluster", + "code": 4294048773, + "mfgCode": null, + "define": "TEST_CLUSTER", + "side": "client", + "enabled": 0, + "commands": [ + { + "name": "Test", + "code": 0, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "TestNotHandled", + "code": 1, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "TestSpecific", + "code": 2, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "TestAddArguments", + "code": 4, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "TestStructArgumentRequest", + "code": 7, "mfgCode": null, "source": "client", "incoming": 1, @@ -20595,355 +20505,109 @@ "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "nullable_char_string", - "code": 16414, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "nullable_enum_attr", - "code": 16420, - "mfgCode": null, - "side": "server", - "type": "SimpleEnum", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "nullable_struct", - "code": 16421, - "mfgCode": null, - "side": "server", - "type": "SimpleStruct", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "nullable_range_restricted_int8u", - "code": 16422, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "70", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "nullable_range_restricted_int8s", - "code": 16423, - "mfgCode": null, - "side": "server", - "type": "int8s", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "-20", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "nullable_range_restricted_int16u", - "code": 16424, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "200", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "nullable_range_restricted_int16s", - "code": 16425, - "mfgCode": null, - "side": "server", - "type": "int16s", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "-100", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 0, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Electrical Measurement", - "code": 2820, - "mfgCode": null, - "define": "ELECTRICAL_MEASUREMENT_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Electrical Measurement", - "code": 2820, - "mfgCode": null, - "define": "ELECTRICAL_MEASUREMENT_CLUSTER", - "side": "server", - "enabled": 1, - "commands": [], - "attributes": [ - { - "name": "measurement type", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x000000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "total active power", - "code": 772, - "mfgCode": null, - "side": "server", - "type": "int32s", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x000000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "rms voltage", - "code": 1285, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xffff", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "rms voltage min", - "code": 1286, + "name": "nullable_char_string", + "code": 16414, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x8000", + "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "rms voltage max", - "code": 1287, + "name": "nullable_enum_attr", + "code": 16420, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "SimpleEnum", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x8000", + "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "rms current", - "code": 1288, + "name": "nullable_struct", + "code": 16421, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "SimpleStruct", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0xffff", + "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "rms current min", - "code": 1289, + "name": "nullable_range_restricted_int8u", + "code": 16422, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0xffff", + "defaultValue": "70", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "rms current max", - "code": 1290, + "name": "nullable_range_restricted_int8s", + "code": 16423, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "int8s", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0xffff", + "defaultValue": "-20", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "active power", - "code": 1291, + "name": "nullable_range_restricted_int16u", + "code": 16424, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0xffff", + "defaultValue": "200", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "active power min", - "code": 1292, + "name": "nullable_range_restricted_int16s", + "code": 16425, "mfgCode": null, "side": "server", "type": "int16s", @@ -20951,26 +20615,26 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0xffff", + "defaultValue": "-100", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "active power max", - "code": 1293, + "name": "AttributeList", + "code": 65531, "mfgCode": null, "side": "server", - "type": "int16s", - "included": 1, - "storageOption": "RAM", + "type": "array", + "included": 0, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0xffff", + "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { @@ -20999,7 +20663,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "3", + "defaultValue": "1", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -22344,7 +22008,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "PowerSourceStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -22424,7 +22088,7 @@ "code": 5, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "WiredCurrentType", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -22516,7 +22180,7 @@ "reportableChange": 0 }, { - "name": "BatteryVoltage", + "name": "BatVoltage", "code": 11, "mfgCode": null, "side": "server", @@ -22532,7 +22196,7 @@ "reportableChange": 0 }, { - "name": "BatteryPercentRemaining", + "name": "BatPercentRemaining", "code": 12, "mfgCode": null, "side": "server", @@ -22548,7 +22212,7 @@ "reportableChange": 0 }, { - "name": "BatteryTimeRemaining", + "name": "BatTimeRemaining", "code": 13, "mfgCode": null, "side": "server", @@ -22564,11 +22228,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeLevel", + "name": "BatChargeLevel", "code": 14, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeLevel", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -22580,7 +22244,7 @@ "reportableChange": 0 }, { - "name": "BatteryReplacementNeeded", + "name": "BatReplacementNeeded", "code": 15, "mfgCode": null, "side": "server", @@ -22596,11 +22260,11 @@ "reportableChange": 0 }, { - "name": "BatteryReplaceability", + "name": "BatReplaceability", "code": 16, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatReplaceability", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -22612,7 +22276,7 @@ "reportableChange": 0 }, { - "name": "BatteryPresent", + "name": "BatPresent", "code": 17, "mfgCode": null, "side": "server", @@ -22628,7 +22292,7 @@ "reportableChange": 0 }, { - "name": "ActiveBatteryFaults", + "name": "ActiveBatFaults", "code": 18, "mfgCode": null, "side": "server", @@ -22644,7 +22308,7 @@ "reportableChange": 0 }, { - "name": "BatteryReplacementDescription", + "name": "BatReplacementDescription", "code": 19, "mfgCode": null, "side": "server", @@ -22660,7 +22324,7 @@ "reportableChange": 0 }, { - "name": "BatteryCommonDesignation", + "name": "BatCommonDesignation", "code": 20, "mfgCode": null, "side": "server", @@ -22676,7 +22340,7 @@ "reportableChange": 0 }, { - "name": "BatteryANSIDesignation", + "name": "BatANSIDesignation", "code": 21, "mfgCode": null, "side": "server", @@ -22692,7 +22356,7 @@ "reportableChange": 0 }, { - "name": "BatteryIECDesignation", + "name": "BatIECDesignation", "code": 22, "mfgCode": null, "side": "server", @@ -22708,7 +22372,7 @@ "reportableChange": 0 }, { - "name": "BatteryApprovedChemistry", + "name": "BatApprovedChemistry", "code": 23, "mfgCode": null, "side": "server", @@ -22724,7 +22388,7 @@ "reportableChange": 0 }, { - "name": "BatteryCapacity", + "name": "BatCapacity", "code": 24, "mfgCode": null, "side": "server", @@ -22740,7 +22404,7 @@ "reportableChange": 0 }, { - "name": "BatteryQuantity", + "name": "BatQuantity", "code": 25, "mfgCode": null, "side": "server", @@ -22756,11 +22420,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeState", + "name": "BatChargeState", "code": 26, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeState", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -22772,7 +22436,7 @@ "reportableChange": 0 }, { - "name": "BatteryTimeToFullCharge", + "name": "BatTimeToFullCharge", "code": 27, "mfgCode": null, "side": "server", @@ -22788,7 +22452,7 @@ "reportableChange": 0 }, { - "name": "BatteryFunctionalWhileCharging", + "name": "BatFunctionalWhileCharging", "code": 28, "mfgCode": null, "side": "server", @@ -22804,7 +22468,7 @@ "reportableChange": 0 }, { - "name": "BatteryChargingCurrent", + "name": "BatChargingCurrent", "code": 29, "mfgCode": null, "side": "server", @@ -22820,7 +22484,7 @@ "reportableChange": 0 }, { - "name": "ActiveBatteryChargeFaults", + "name": "ActiveBatChargeFaults", "code": 30, "mfgCode": null, "side": "server", @@ -24613,166 +24277,6 @@ "reportableChange": 0 } ] - }, - { - "name": "IAS Zone", - "code": 1280, - "mfgCode": null, - "define": "IAS_ZONE_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "ZoneEnrollResponse", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "IAS Zone", - "code": 1280, - "mfgCode": null, - "define": "IAS_ZONE_CLUSTER", - "side": "server", - "enabled": 0, - "commands": [ - { - "name": "ZoneStatusChangeNotification", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "ZoneEnrollRequest", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "zone state", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "enum8", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "zone type", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "enum16", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "zone status", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "IAS CIE address", - "code": 16, - "mfgCode": null, - "side": "server", - "type": "node_id", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "Zone ID", - "code": 17, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xff", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] } ] }, @@ -25158,6 +24662,5 @@ "endpointVersion": 1, "deviceIdentifier": 61442 } - ], - "log": [] -} + ] +} \ No newline at end of file diff --git a/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp b/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp index 246825835638eb..d413072f671db1 100644 --- a/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp +++ b/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp @@ -309,7 +309,7 @@ class EditAttributeListModel : public TouchesMatterStackModel { // update the battery percent remaining here for hardcoded endpoint 1 ESP_LOGI(TAG, "Battery percent remaining changed to : %d", n); - app::Clusters::PowerSource::Attributes::BatteryPercentRemaining::Set(1, static_cast(n * 2)); + app::Clusters::PowerSource::Attributes::BatPercentRemaining::Set(1, static_cast(n * 2)); } value = buffer; } @@ -373,7 +373,7 @@ class EditAttributeListModel : public TouchesMatterStackModel // update the battery charge level here for hardcoded endpoint 1 ESP_LOGI(TAG, "Battery charge level changed to : %u", static_cast(attributeValue)); - app::Clusters::PowerSource::Attributes::BatteryChargeLevel::Set(1, static_cast(attributeValue)); + app::Clusters::PowerSource::Attributes::BatChargeLevel::Set(1, attributeValue); } else { @@ -686,9 +686,9 @@ void SetupPretendDevices() AddEndpoint("1"); AddCluster("Power Source"); AddAttribute("Bat remaining", "70"); - app::Clusters::PowerSource::Attributes::BatteryPercentRemaining::Set(1, static_cast(70 * 2)); + app::Clusters::PowerSource::Attributes::BatPercentRemaining::Set(1, static_cast(70 * 2)); AddAttribute("Charge level", "0"); - app::Clusters::PowerSource::Attributes::BatteryChargeLevel::Set(1, static_cast(0)); + app::Clusters::PowerSource::Attributes::BatChargeLevel::Set(1, app::Clusters::PowerSource::BatChargeLevel::kOk); } esp_err_t InitM5Stack(std::string qrCodeText) diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 370f71ee8a4d3a..cf398400d456a2 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -712,7 +712,7 @@ server cluster PowerSourceConfiguration = 46 { } server cluster PowerSource = 47 { - enum BatChargeFaultType : ENUM8 { + enum BatChargeFault : ENUM8 { kUnspecfied = 0; kAmbientTooHot = 1; kAmbientTooCold = 2; @@ -739,7 +739,7 @@ server cluster PowerSource = 47 { kIsNotCharging = 3; } - enum BatFaultType : ENUM8 { + enum BatFault : ENUM8 { kUnspecfied = 0; kOverTemp = 1; kUnderTemp = 2; @@ -764,7 +764,7 @@ server cluster PowerSource = 47 { kDc = 1; } - enum WiredFaultType : ENUM8 { + enum WiredFault : ENUM8 { kUnspecfied = 0; kOverVoltage = 1; kUnderVoltage = 2; @@ -777,7 +777,7 @@ server cluster PowerSource = 47 { kReplaceable = 0x8; } - readonly attribute enum8 status = 0; + readonly attribute PowerSourceStatus status = 0; readonly attribute int8u order = 1; readonly attribute char_string<60> description = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index 8a0a01ca25588f..238a2ffd37dab9 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 71, + "featureLevel": 72, "creator": "zap", "keyValuePairs": [ { @@ -2219,7 +2219,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "PowerSourceStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2299,7 +2299,7 @@ "code": 5, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "WiredCurrentType", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -2391,7 +2391,7 @@ "reportableChange": 0 }, { - "name": "BatteryVoltage", + "name": "BatVoltage", "code": 11, "mfgCode": null, "side": "server", @@ -2407,7 +2407,7 @@ "reportableChange": 0 }, { - "name": "BatteryPercentRemaining", + "name": "BatPercentRemaining", "code": 12, "mfgCode": null, "side": "server", @@ -2423,7 +2423,7 @@ "reportableChange": 0 }, { - "name": "BatteryTimeRemaining", + "name": "BatTimeRemaining", "code": 13, "mfgCode": null, "side": "server", @@ -2439,11 +2439,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeLevel", + "name": "BatChargeLevel", "code": 14, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeLevel", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -2455,7 +2455,7 @@ "reportableChange": 0 }, { - "name": "BatteryReplacementNeeded", + "name": "BatReplacementNeeded", "code": 15, "mfgCode": null, "side": "server", @@ -2471,11 +2471,11 @@ "reportableChange": 0 }, { - "name": "BatteryReplaceability", + "name": "BatReplaceability", "code": 16, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatReplaceability", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -2487,7 +2487,7 @@ "reportableChange": 0 }, { - "name": "BatteryPresent", + "name": "BatPresent", "code": 17, "mfgCode": null, "side": "server", @@ -2503,7 +2503,7 @@ "reportableChange": 0 }, { - "name": "ActiveBatteryFaults", + "name": "ActiveBatFaults", "code": 18, "mfgCode": null, "side": "server", @@ -2519,7 +2519,7 @@ "reportableChange": 0 }, { - "name": "BatteryReplacementDescription", + "name": "BatReplacementDescription", "code": 19, "mfgCode": null, "side": "server", @@ -2535,7 +2535,7 @@ "reportableChange": 0 }, { - "name": "BatteryCommonDesignation", + "name": "BatCommonDesignation", "code": 20, "mfgCode": null, "side": "server", @@ -2551,7 +2551,7 @@ "reportableChange": 0 }, { - "name": "BatteryANSIDesignation", + "name": "BatANSIDesignation", "code": 21, "mfgCode": null, "side": "server", @@ -2567,7 +2567,7 @@ "reportableChange": 0 }, { - "name": "BatteryIECDesignation", + "name": "BatIECDesignation", "code": 22, "mfgCode": null, "side": "server", @@ -2583,7 +2583,7 @@ "reportableChange": 0 }, { - "name": "BatteryApprovedChemistry", + "name": "BatApprovedChemistry", "code": 23, "mfgCode": null, "side": "server", @@ -2599,7 +2599,7 @@ "reportableChange": 0 }, { - "name": "BatteryCapacity", + "name": "BatCapacity", "code": 24, "mfgCode": null, "side": "server", @@ -2615,7 +2615,7 @@ "reportableChange": 0 }, { - "name": "BatteryQuantity", + "name": "BatQuantity", "code": 25, "mfgCode": null, "side": "server", @@ -2631,11 +2631,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeState", + "name": "BatChargeState", "code": 26, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeState", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -2647,7 +2647,7 @@ "reportableChange": 0 }, { - "name": "BatteryTimeToFullCharge", + "name": "BatTimeToFullCharge", "code": 27, "mfgCode": null, "side": "server", @@ -2663,7 +2663,7 @@ "reportableChange": 0 }, { - "name": "BatteryFunctionalWhileCharging", + "name": "BatFunctionalWhileCharging", "code": 28, "mfgCode": null, "side": "server", @@ -2679,7 +2679,7 @@ "reportableChange": 0 }, { - "name": "BatteryChargingCurrent", + "name": "BatChargingCurrent", "code": 29, "mfgCode": null, "side": "server", @@ -2695,7 +2695,7 @@ "reportableChange": 0 }, { - "name": "ActiveBatteryChargeFaults", + "name": "ActiveBatChargeFaults", "code": 30, "mfgCode": null, "side": "server", @@ -8106,166 +8106,6 @@ } ] }, - { - "name": "IAS Zone", - "code": 1280, - "mfgCode": null, - "define": "IAS_ZONE_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "ZoneEnrollResponse", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "IAS Zone", - "code": 1280, - "mfgCode": null, - "define": "IAS_ZONE_CLUSTER", - "side": "server", - "enabled": 0, - "commands": [ - { - "name": "ZoneStatusChangeNotification", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "ZoneEnrollRequest", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "zone state", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "enum8", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "zone type", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "enum16", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "zone status", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "IAS CIE address", - "code": 16, - "mfgCode": null, - "side": "server", - "type": "node_id", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "Zone ID", - "code": 17, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xff", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, { "name": "Test Cluster", "code": 4294048773, @@ -11018,7 +10858,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "PowerSourceStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11098,7 +10938,7 @@ "code": 5, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "WiredCurrentType", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -11190,7 +11030,7 @@ "reportableChange": 0 }, { - "name": "BatteryVoltage", + "name": "BatVoltage", "code": 11, "mfgCode": null, "side": "server", @@ -11206,7 +11046,7 @@ "reportableChange": 0 }, { - "name": "BatteryPercentRemaining", + "name": "BatPercentRemaining", "code": 12, "mfgCode": null, "side": "server", @@ -11222,7 +11062,7 @@ "reportableChange": 0 }, { - "name": "BatteryTimeRemaining", + "name": "BatTimeRemaining", "code": 13, "mfgCode": null, "side": "server", @@ -11238,11 +11078,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeLevel", + "name": "BatChargeLevel", "code": 14, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeLevel", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -11254,7 +11094,7 @@ "reportableChange": 0 }, { - "name": "BatteryReplacementNeeded", + "name": "BatReplacementNeeded", "code": 15, "mfgCode": null, "side": "server", @@ -11270,11 +11110,11 @@ "reportableChange": 0 }, { - "name": "BatteryReplaceability", + "name": "BatReplaceability", "code": 16, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatReplaceability", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -11286,7 +11126,7 @@ "reportableChange": 0 }, { - "name": "BatteryPresent", + "name": "BatPresent", "code": 17, "mfgCode": null, "side": "server", @@ -11302,7 +11142,7 @@ "reportableChange": 0 }, { - "name": "ActiveBatteryFaults", + "name": "ActiveBatFaults", "code": 18, "mfgCode": null, "side": "server", @@ -11318,7 +11158,7 @@ "reportableChange": 0 }, { - "name": "BatteryReplacementDescription", + "name": "BatReplacementDescription", "code": 19, "mfgCode": null, "side": "server", @@ -11334,7 +11174,7 @@ "reportableChange": 0 }, { - "name": "BatteryCommonDesignation", + "name": "BatCommonDesignation", "code": 20, "mfgCode": null, "side": "server", @@ -11350,7 +11190,7 @@ "reportableChange": 0 }, { - "name": "BatteryANSIDesignation", + "name": "BatANSIDesignation", "code": 21, "mfgCode": null, "side": "server", @@ -11366,7 +11206,7 @@ "reportableChange": 0 }, { - "name": "BatteryIECDesignation", + "name": "BatIECDesignation", "code": 22, "mfgCode": null, "side": "server", @@ -11382,7 +11222,7 @@ "reportableChange": 0 }, { - "name": "BatteryApprovedChemistry", + "name": "BatApprovedChemistry", "code": 23, "mfgCode": null, "side": "server", @@ -11398,7 +11238,7 @@ "reportableChange": 0 }, { - "name": "BatteryCapacity", + "name": "BatCapacity", "code": 24, "mfgCode": null, "side": "server", @@ -11414,7 +11254,7 @@ "reportableChange": 0 }, { - "name": "BatteryQuantity", + "name": "BatQuantity", "code": 25, "mfgCode": null, "side": "server", @@ -11430,11 +11270,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeState", + "name": "BatChargeState", "code": 26, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeState", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -11446,7 +11286,7 @@ "reportableChange": 0 }, { - "name": "BatteryTimeToFullCharge", + "name": "BatTimeToFullCharge", "code": 27, "mfgCode": null, "side": "server", @@ -11462,7 +11302,7 @@ "reportableChange": 0 }, { - "name": "BatteryFunctionalWhileCharging", + "name": "BatFunctionalWhileCharging", "code": 28, "mfgCode": null, "side": "server", @@ -11478,7 +11318,7 @@ "reportableChange": 0 }, { - "name": "BatteryChargingCurrent", + "name": "BatChargingCurrent", "code": 29, "mfgCode": null, "side": "server", @@ -11494,7 +11334,7 @@ "reportableChange": 0 }, { - "name": "ActiveBatteryChargeFaults", + "name": "ActiveBatChargeFaults", "code": 30, "mfgCode": null, "side": "server", @@ -13693,7 +13533,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OperationalStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -13869,7 +13709,7 @@ "code": 26, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "SafetyStatus", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -17270,22 +17110,13 @@ ] }, { - "name": "IAS Zone", - "code": 1280, + "name": "Wake on LAN", + "code": 1283, "mfgCode": null, - "define": "IAS_ZONE_CLUSTER", + "define": "WAKE_ON_LAN_CLUSTER", "side": "client", "enabled": 0, - "commands": [ - { - "name": "ZoneEnrollResponse", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "ClusterRevision", @@ -17297,7 +17128,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "2", + "defaultValue": "1", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -17306,54 +17137,21 @@ ] }, { - "name": "IAS Zone", - "code": 1280, + "name": "Wake on LAN", + "code": 1283, "mfgCode": null, - "define": "IAS_ZONE_CLUSTER", + "define": "WAKE_ON_LAN_CLUSTER", "side": "server", - "enabled": 0, - "commands": [ - { - "name": "ZoneStatusChangeNotification", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "ZoneEnrollRequest", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "enabled": 1, + "commands": [], "attributes": [ { - "name": "zone state", + "name": "MACAddress", "code": 0, "mfgCode": null, "side": "server", - "type": "enum8", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "zone type", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "enum16", - "included": 1, + "type": "char_string", + "included": 0, "storageOption": "RAM", "singleton": 0, "bounded": 0, @@ -17364,51 +17162,51 @@ "reportableChange": 0 }, { - "name": "zone status", - "code": 2, + "name": "GeneratedCommandList", + "code": 65528, "mfgCode": null, "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "RAM", + "type": "array", + "included": 0, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x0000", + "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "IAS CIE address", - "code": 16, + "name": "AcceptedCommandList", + "code": 65529, "mfgCode": null, "side": "server", - "type": "node_id", - "included": 1, - "storageOption": "RAM", + "type": "array", + "included": 0, + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "Zone ID", - "code": 17, + "name": "AttributeList", + "code": 65531, "mfgCode": null, "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", + "type": "array", + "included": 0, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0xff", + "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { @@ -17437,141 +17235,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Wake on LAN", - "code": 1283, - "mfgCode": null, - "define": "WAKE_ON_LAN_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Wake on LAN", - "code": 1283, - "mfgCode": null, - "define": "WAKE_ON_LAN_CLUSTER", - "side": "server", - "enabled": 1, - "commands": [], - "attributes": [ - { - "name": "MACAddress", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "GeneratedCommandList", - "code": 65528, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 0, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AcceptedCommandList", - "code": 65529, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 0, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 0, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", + "defaultValue": "1", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -19157,63 +18821,309 @@ ] }, { - "name": "Test Cluster", - "code": 4294048773, + "name": "Electrical Measurement", + "code": 2820, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "ELECTRICAL_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, - "commands": [ + "commands": [], + "attributes": [ { - "name": "Test", - "code": 0, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, + "side": "client", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "3", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + } + ] + }, + { + "name": "Electrical Measurement", + "code": 2820, + "mfgCode": null, + "define": "ELECTRICAL_MEASUREMENT_CLUSTER", + "side": "server", + "enabled": 0, + "commands": [], + "attributes": [ { - "name": "TestNotHandled", - "code": 1, + "name": "measurement type", + "code": 0, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 + "side": "server", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x000000", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 }, { - "name": "TestSpecific", - "code": 2, + "name": "total active power", + "code": 772, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 + "side": "server", + "type": "int32s", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x000000", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 }, { - "name": "TestAddArguments", - "code": 4, + "name": "rms voltage", + "code": 1285, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xffff", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 }, { - "name": "TestStructArgumentRequest", - "code": 7, + "name": "rms voltage min", + "code": 1286, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x8000", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 }, { - "name": "TestNestedStructArgumentRequest", - "code": 8, + "name": "rms voltage max", + "code": 1287, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "TestListStructArgumentRequest", + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x8000", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "rms current", + "code": 1288, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xffff", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "rms current min", + "code": 1289, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xffff", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "rms current max", + "code": 1290, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xffff", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "active power", + "code": 1291, + "mfgCode": null, + "side": "server", + "type": "int16s", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xffff", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "active power min", + "code": 1292, + "mfgCode": null, + "side": "server", + "type": "int16s", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xffff", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "active power max", + "code": 1293, + "mfgCode": null, + "side": "server", + "type": "int16s", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xffff", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "3", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + } + ] + }, + { + "name": "Test Cluster", + "code": 4294048773, + "mfgCode": null, + "define": "TEST_CLUSTER", + "side": "client", + "enabled": 0, + "commands": [ + { + "name": "Test", + "code": 0, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "TestNotHandled", + "code": 1, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "TestSpecific", + "code": 2, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "TestAddArguments", + "code": 4, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "TestStructArgumentRequest", + "code": 7, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "TestNestedStructArgumentRequest", + "code": 8, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "TestListStructArgumentRequest", "code": 9, "mfgCode": null, "source": "client", @@ -20580,357 +20490,111 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "nullable_char_string", - "code": 16414, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "nullable_enum_attr", - "code": 16420, - "mfgCode": null, - "side": "server", - "type": "SimpleEnum", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "nullable_struct", - "code": 16421, - "mfgCode": null, - "side": "server", - "type": "SimpleStruct", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "nullable_range_restricted_int8u", - "code": 16422, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "70", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "nullable_range_restricted_int8s", - "code": 16423, - "mfgCode": null, - "side": "server", - "type": "int8s", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "-20", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "nullable_range_restricted_int16u", - "code": 16424, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "200", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "nullable_range_restricted_int16s", - "code": 16425, - "mfgCode": null, - "side": "server", - "type": "int16s", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "-100", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 0, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Electrical Measurement", - "code": 2820, - "mfgCode": null, - "define": "ELECTRICAL_MEASUREMENT_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "3", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Electrical Measurement", - "code": 2820, - "mfgCode": null, - "define": "ELECTRICAL_MEASUREMENT_CLUSTER", - "side": "server", - "enabled": 0, - "commands": [], - "attributes": [ - { - "name": "measurement type", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x000000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "total active power", - "code": 772, - "mfgCode": null, - "side": "server", - "type": "int32s", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x000000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "rms voltage", - "code": 1285, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xffff", + "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "rms voltage min", - "code": 1286, + "name": "nullable_char_string", + "code": 16414, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x8000", + "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "rms voltage max", - "code": 1287, + "name": "nullable_enum_attr", + "code": 16420, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "SimpleEnum", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x8000", + "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "rms current", - "code": 1288, + "name": "nullable_struct", + "code": 16421, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "SimpleStruct", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0xffff", + "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "rms current min", - "code": 1289, + "name": "nullable_range_restricted_int8u", + "code": 16422, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0xffff", + "defaultValue": "70", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "rms current max", - "code": 1290, + "name": "nullable_range_restricted_int8s", + "code": 16423, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "int8s", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0xffff", + "defaultValue": "-20", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "active power", - "code": 1291, + "name": "nullable_range_restricted_int16u", + "code": 16424, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0xffff", + "defaultValue": "200", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "active power min", - "code": 1292, + "name": "nullable_range_restricted_int16s", + "code": 16425, "mfgCode": null, "side": "server", "type": "int16s", @@ -20938,26 +20602,26 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0xffff", + "defaultValue": "-100", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "active power max", - "code": 1293, + "name": "AttributeList", + "code": 65531, "mfgCode": null, "side": "server", - "type": "int16s", - "included": 1, - "storageOption": "RAM", + "type": "array", + "included": 0, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0xffff", + "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { @@ -20986,7 +20650,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "3", + "defaultValue": "1", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -22331,7 +21995,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "PowerSourceStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -22411,7 +22075,7 @@ "code": 5, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "WiredCurrentType", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -22503,7 +22167,7 @@ "reportableChange": 0 }, { - "name": "BatteryVoltage", + "name": "BatVoltage", "code": 11, "mfgCode": null, "side": "server", @@ -22519,7 +22183,7 @@ "reportableChange": 0 }, { - "name": "BatteryPercentRemaining", + "name": "BatPercentRemaining", "code": 12, "mfgCode": null, "side": "server", @@ -22535,7 +22199,7 @@ "reportableChange": 0 }, { - "name": "BatteryTimeRemaining", + "name": "BatTimeRemaining", "code": 13, "mfgCode": null, "side": "server", @@ -22551,11 +22215,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeLevel", + "name": "BatChargeLevel", "code": 14, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeLevel", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -22567,7 +22231,7 @@ "reportableChange": 0 }, { - "name": "BatteryReplacementNeeded", + "name": "BatReplacementNeeded", "code": 15, "mfgCode": null, "side": "server", @@ -22583,11 +22247,11 @@ "reportableChange": 0 }, { - "name": "BatteryReplaceability", + "name": "BatReplaceability", "code": 16, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatReplaceability", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -22599,7 +22263,7 @@ "reportableChange": 0 }, { - "name": "BatteryPresent", + "name": "BatPresent", "code": 17, "mfgCode": null, "side": "server", @@ -22615,7 +22279,7 @@ "reportableChange": 0 }, { - "name": "ActiveBatteryFaults", + "name": "ActiveBatFaults", "code": 18, "mfgCode": null, "side": "server", @@ -22631,7 +22295,7 @@ "reportableChange": 0 }, { - "name": "BatteryReplacementDescription", + "name": "BatReplacementDescription", "code": 19, "mfgCode": null, "side": "server", @@ -22647,7 +22311,7 @@ "reportableChange": 0 }, { - "name": "BatteryCommonDesignation", + "name": "BatCommonDesignation", "code": 20, "mfgCode": null, "side": "server", @@ -22663,7 +22327,7 @@ "reportableChange": 0 }, { - "name": "BatteryANSIDesignation", + "name": "BatANSIDesignation", "code": 21, "mfgCode": null, "side": "server", @@ -22679,7 +22343,7 @@ "reportableChange": 0 }, { - "name": "BatteryIECDesignation", + "name": "BatIECDesignation", "code": 22, "mfgCode": null, "side": "server", @@ -22695,7 +22359,7 @@ "reportableChange": 0 }, { - "name": "BatteryApprovedChemistry", + "name": "BatApprovedChemistry", "code": 23, "mfgCode": null, "side": "server", @@ -22711,7 +22375,7 @@ "reportableChange": 0 }, { - "name": "BatteryCapacity", + "name": "BatCapacity", "code": 24, "mfgCode": null, "side": "server", @@ -22727,7 +22391,7 @@ "reportableChange": 0 }, { - "name": "BatteryQuantity", + "name": "BatQuantity", "code": 25, "mfgCode": null, "side": "server", @@ -22743,11 +22407,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeState", + "name": "BatChargeState", "code": 26, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeState", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -22759,7 +22423,7 @@ "reportableChange": 0 }, { - "name": "BatteryTimeToFullCharge", + "name": "BatTimeToFullCharge", "code": 27, "mfgCode": null, "side": "server", @@ -22775,7 +22439,7 @@ "reportableChange": 0 }, { - "name": "BatteryFunctionalWhileCharging", + "name": "BatFunctionalWhileCharging", "code": 28, "mfgCode": null, "side": "server", @@ -22791,7 +22455,7 @@ "reportableChange": 0 }, { - "name": "BatteryChargingCurrent", + "name": "BatChargingCurrent", "code": 29, "mfgCode": null, "side": "server", @@ -22807,7 +22471,7 @@ "reportableChange": 0 }, { - "name": "ActiveBatteryChargeFaults", + "name": "ActiveBatChargeFaults", "code": 30, "mfgCode": null, "side": "server", @@ -24600,166 +24264,6 @@ "reportableChange": 0 } ] - }, - { - "name": "IAS Zone", - "code": 1280, - "mfgCode": null, - "define": "IAS_ZONE_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [ - { - "name": "ZoneEnrollResponse", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "IAS Zone", - "code": 1280, - "mfgCode": null, - "define": "IAS_ZONE_CLUSTER", - "side": "server", - "enabled": 0, - "commands": [ - { - "name": "ZoneStatusChangeNotification", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "ZoneEnrollRequest", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], - "attributes": [ - { - "name": "zone state", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "enum8", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "zone type", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "enum16", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "zone status", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "IAS CIE address", - "code": 16, - "mfgCode": null, - "side": "server", - "type": "node_id", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "Zone ID", - "code": 17, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xff", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] } ] }, @@ -25146,4 +24650,4 @@ "deviceIdentifier": 61442 } ] -} +} \ No newline at end of file diff --git a/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp b/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp index 987a095134b16d..9557c97851d08e 100644 --- a/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp +++ b/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp @@ -219,7 +219,7 @@ class EditAttributeListModel : public TouchesMatterStackModel { // update the battery percent remaining here for hardcoded endpoint 1 ESP_LOGI(TAG, "Battery percent remaining changed to : %d", n); - app::Clusters::PowerSource::Attributes::BatteryPercentRemaining::Set(1, static_cast(n * 2)); + app::Clusters::PowerSource::Attributes::BatPercentRemaining::Set(1, static_cast(n * 2)); } value = buffer; } @@ -283,7 +283,7 @@ class EditAttributeListModel : public TouchesMatterStackModel // update the battery charge level here for hardcoded endpoint 1 ESP_LOGI(TAG, "Battery charge level changed to : %u", static_cast(attributeValue)); - app::Clusters::PowerSource::Attributes::BatteryChargeLevel::Set(1, static_cast(attributeValue)); + app::Clusters::PowerSource::Attributes::BatChargeLevel::Set(1, attributeValue); } else { @@ -590,9 +590,9 @@ void SetupPretendDevices() AddEndpoint("1"); AddCluster("Power Source"); AddAttribute("Bat remaining", "70"); - app::Clusters::PowerSource::Attributes::BatteryPercentRemaining::Set(1, static_cast(70 * 2)); + app::Clusters::PowerSource::Attributes::BatPercentRemaining::Set(1, static_cast(70 * 2)); AddAttribute("Charge level", "0"); - app::Clusters::PowerSource::Attributes::BatteryChargeLevel::Set(1, static_cast(0)); + app::Clusters::PowerSource::Attributes::BatChargeLevel::Set(1, app::Clusters::PowerSource::BatChargeLevel::kOk); } esp_err_t InitM5Stack(std::string qrCodeText) diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp index d069d8ce7a0caf..d0b411446a210b 100644 --- a/examples/bridge-app/linux/main.cpp +++ b/examples/bridge-app/linux/main.cpp @@ -435,9 +435,8 @@ void HandleDevicePowerSourceStatusChanged(DevicePowerSource * dev, DevicePowerSo if (itemChangedMask & DevicePowerSource::kChanged_BatLevel) { uint8_t batChargeLevel = dev->GetBatChargeLevel(); - MatterReportingAttributeChangeCallback(dev->GetEndpointId(), PowerSource::Id, - PowerSource::Attributes::BatteryChargeLevel::Id, ZCL_INT8U_ATTRIBUTE_TYPE, - &batChargeLevel); + MatterReportingAttributeChangeCallback(dev->GetEndpointId(), PowerSource::Id, PowerSource::Attributes::BatChargeLevel::Id, + ZCL_INT8U_ATTRIBUTE_TYPE, &batChargeLevel); } if (itemChangedMask & DevicePowerSource::kChanged_Description) @@ -549,7 +548,7 @@ EmberAfStatus HandleReadPowerSourceAttribute(DevicePowerSource * dev, chip::Attr uint16_t maxReadLength) { using namespace app::Clusters; - if ((attributeId == PowerSource::Attributes::BatteryChargeLevel::Id) && (maxReadLength == 1)) + if ((attributeId == PowerSource::Attributes::BatChargeLevel::Id) && (maxReadLength == 1)) { *buffer = dev->GetBatChargeLevel(); } diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 6f73f7dc96d337..f3fea5b77f892a 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -449,7 +449,7 @@ server cluster PowerSourceConfiguration = 46 { } server cluster PowerSource = 47 { - enum BatChargeFaultType : ENUM8 { + enum BatChargeFault : ENUM8 { kUnspecfied = 0; kAmbientTooHot = 1; kAmbientTooCold = 2; @@ -476,7 +476,7 @@ server cluster PowerSource = 47 { kIsNotCharging = 3; } - enum BatFaultType : ENUM8 { + enum BatFault : ENUM8 { kUnspecfied = 0; kOverTemp = 1; kUnderTemp = 2; @@ -501,7 +501,7 @@ server cluster PowerSource = 47 { kDc = 1; } - enum WiredFaultType : ENUM8 { + enum WiredFault : ENUM8 { kUnspecfied = 0; kOverVoltage = 1; kUnderVoltage = 2; @@ -514,14 +514,14 @@ server cluster PowerSource = 47 { kReplaceable = 0x8; } - readonly attribute enum8 status = 0; + readonly attribute PowerSourceStatus status = 0; readonly attribute int8u order = 1; readonly attribute char_string<60> description = 2; - readonly attribute int32u wiredAssessedCurrent = 6; - readonly attribute enum8 batteryChargeLevel = 14; - readonly attribute boolean batteryReplacementNeeded = 15; - readonly attribute enum8 batteryReplaceability = 16; - readonly attribute char_string<60> batteryReplacementDescription = 19; + readonly attribute nullable int32u wiredAssessedCurrent = 6; + readonly attribute BatChargeLevel batChargeLevel = 14; + readonly attribute boolean batReplacementNeeded = 15; + readonly attribute BatReplaceability batReplaceability = 16; + readonly attribute char_string<60> batReplacementDescription = 19; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; } @@ -2238,10 +2238,10 @@ endpoint 1 { ram attribute status default = 1; ram attribute order default = 1; ram attribute description default = "Battery"; - ram attribute batteryChargeLevel; - ram attribute batteryReplacementNeeded; - ram attribute batteryReplaceability; - ram attribute batteryReplacementDescription; + ram attribute batChargeLevel; + ram attribute batReplacementNeeded; + ram attribute batReplaceability; + ram attribute batReplacementDescription; ram attribute featureMap default = 0x0A; ram attribute clusterRevision default = 1; } diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index fee787bd531ac9..d294fde5d4cddf 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -545,7 +545,7 @@ server cluster PowerSourceConfiguration = 46 { } server cluster PowerSource = 47 { - enum BatChargeFaultType : ENUM8 { + enum BatChargeFault : ENUM8 { kUnspecfied = 0; kAmbientTooHot = 1; kAmbientTooCold = 2; @@ -572,7 +572,7 @@ server cluster PowerSource = 47 { kIsNotCharging = 3; } - enum BatFaultType : ENUM8 { + enum BatFault : ENUM8 { kUnspecfied = 0; kOverTemp = 1; kUnderTemp = 2; @@ -597,7 +597,7 @@ server cluster PowerSource = 47 { kDc = 1; } - enum WiredFaultType : ENUM8 { + enum WiredFault : ENUM8 { kUnspecfied = 0; kOverVoltage = 1; kUnderVoltage = 2; @@ -610,37 +610,37 @@ server cluster PowerSource = 47 { kReplaceable = 0x8; } - readonly attribute enum8 status = 0; + readonly attribute PowerSourceStatus status = 0; readonly attribute int8u order = 1; readonly attribute char_string<60> description = 2; - readonly attribute int32u wiredAssessedInputVoltage = 3; - readonly attribute int16u wiredAssessedInputFrequency = 4; - readonly attribute enum8 wiredCurrentType = 5; - readonly attribute int32u wiredAssessedCurrent = 6; + readonly attribute nullable int32u wiredAssessedInputVoltage = 3; + readonly attribute nullable int16u wiredAssessedInputFrequency = 4; + readonly attribute WiredCurrentType wiredCurrentType = 5; + readonly attribute nullable int32u wiredAssessedCurrent = 6; readonly attribute int32u wiredNominalVoltage = 7; readonly attribute int32u wiredMaximumCurrent = 8; readonly attribute boolean wiredPresent = 9; - readonly attribute ENUM8 activeWiredFaults[] = 10; - readonly attribute int32u batteryVoltage = 11; - readonly attribute int8u batteryPercentRemaining = 12; - readonly attribute int32u batteryTimeRemaining = 13; - readonly attribute enum8 batteryChargeLevel = 14; - readonly attribute boolean batteryReplacementNeeded = 15; - readonly attribute enum8 batteryReplaceability = 16; - readonly attribute boolean batteryPresent = 17; - readonly attribute ENUM8 activeBatteryFaults[] = 18; - readonly attribute char_string<60> batteryReplacementDescription = 19; - readonly attribute int32u batteryCommonDesignation = 20; - readonly attribute char_string<20> batteryANSIDesignation = 21; - readonly attribute char_string<20> batteryIECDesignation = 22; - readonly attribute int32u batteryApprovedChemistry = 23; - readonly attribute int32u batteryCapacity = 24; - readonly attribute int8u batteryQuantity = 25; - readonly attribute enum8 batteryChargeState = 26; - readonly attribute int32u batteryTimeToFullCharge = 27; - readonly attribute boolean batteryFunctionalWhileCharging = 28; - readonly attribute int32u batteryChargingCurrent = 29; - readonly attribute ENUM8 activeBatteryChargeFaults[] = 30; + readonly attribute WiredFault activeWiredFaults[] = 10; + readonly attribute nullable int32u batVoltage = 11; + readonly attribute nullable int8u batPercentRemaining = 12; + readonly attribute nullable int32u batTimeRemaining = 13; + readonly attribute BatChargeLevel batChargeLevel = 14; + readonly attribute boolean batReplacementNeeded = 15; + readonly attribute BatReplaceability batReplaceability = 16; + readonly attribute boolean batPresent = 17; + readonly attribute BatFault activeBatFaults[] = 18; + readonly attribute char_string<60> batReplacementDescription = 19; + readonly attribute int32u batCommonDesignation = 20; + readonly attribute char_string<20> batANSIDesignation = 21; + readonly attribute char_string<20> batIECDesignation = 22; + readonly attribute int32u batApprovedChemistry = 23; + readonly attribute int32u batCapacity = 24; + readonly attribute int8u batQuantity = 25; + readonly attribute BatChargeState batChargeState = 26; + readonly attribute nullable int32u batTimeToFullCharge = 27; + readonly attribute boolean batFunctionalWhileCharging = 28; + readonly attribute nullable int32u batChargingCurrent = 29; + readonly attribute BatChargeFault activeBatChargeFaults[] = 30; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; } @@ -2671,26 +2671,26 @@ endpoint 0 { ram attribute wiredMaximumCurrent; ram attribute wiredPresent; callback attribute activeWiredFaults; - ram attribute batteryVoltage; - ram attribute batteryPercentRemaining; - ram attribute batteryTimeRemaining; - ram attribute batteryChargeLevel; - ram attribute batteryReplacementNeeded; - ram attribute batteryReplaceability; - ram attribute batteryPresent; - callback attribute activeBatteryFaults; - ram attribute batteryReplacementDescription; - ram attribute batteryCommonDesignation; - ram attribute batteryANSIDesignation; - ram attribute batteryIECDesignation; - ram attribute batteryApprovedChemistry; - ram attribute batteryCapacity; - ram attribute batteryQuantity; - ram attribute batteryChargeState; - ram attribute batteryTimeToFullCharge; - ram attribute batteryFunctionalWhileCharging; - ram attribute batteryChargingCurrent; - callback attribute activeBatteryChargeFaults; + ram attribute batVoltage; + ram attribute batPercentRemaining; + ram attribute batTimeRemaining; + ram attribute batChargeLevel; + ram attribute batReplacementNeeded; + ram attribute batReplaceability; + ram attribute batPresent; + callback attribute activeBatFaults; + ram attribute batReplacementDescription; + ram attribute batCommonDesignation; + ram attribute batANSIDesignation; + ram attribute batIECDesignation; + ram attribute batApprovedChemistry; + ram attribute batCapacity; + ram attribute batQuantity; + ram attribute batChargeState; + ram attribute batTimeToFullCharge; + ram attribute batFunctionalWhileCharging; + ram attribute batChargingCurrent; + callback attribute activeBatChargeFaults; ram attribute featureMap; ram attribute clusterRevision default = 1; } diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index 8ad332d5c6c6ab..6dbef1dca7c2ed 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -1,5 +1,5 @@ { - "featureLevel": 71, + "featureLevel": 72, "creator": "zap", "keyValuePairs": [ { @@ -1035,7 +1035,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "PowerSourceStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1115,7 +1115,7 @@ "code": 5, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "WiredCurrentType", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1207,7 +1207,7 @@ "reportableChange": 0 }, { - "name": "BatteryVoltage", + "name": "BatVoltage", "code": 11, "mfgCode": null, "side": "server", @@ -1223,7 +1223,7 @@ "reportableChange": 0 }, { - "name": "BatteryPercentRemaining", + "name": "BatPercentRemaining", "code": 12, "mfgCode": null, "side": "server", @@ -1239,7 +1239,7 @@ "reportableChange": 0 }, { - "name": "BatteryTimeRemaining", + "name": "BatTimeRemaining", "code": 13, "mfgCode": null, "side": "server", @@ -1255,11 +1255,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeLevel", + "name": "BatChargeLevel", "code": 14, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeLevel", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1271,7 +1271,7 @@ "reportableChange": 0 }, { - "name": "BatteryReplacementNeeded", + "name": "BatReplacementNeeded", "code": 15, "mfgCode": null, "side": "server", @@ -1287,11 +1287,11 @@ "reportableChange": 0 }, { - "name": "BatteryReplaceability", + "name": "BatReplaceability", "code": 16, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatReplaceability", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1303,7 +1303,7 @@ "reportableChange": 0 }, { - "name": "BatteryPresent", + "name": "BatPresent", "code": 17, "mfgCode": null, "side": "server", @@ -1319,7 +1319,7 @@ "reportableChange": 0 }, { - "name": "ActiveBatteryFaults", + "name": "ActiveBatFaults", "code": 18, "mfgCode": null, "side": "server", @@ -1335,7 +1335,7 @@ "reportableChange": 0 }, { - "name": "BatteryReplacementDescription", + "name": "BatReplacementDescription", "code": 19, "mfgCode": null, "side": "server", @@ -1351,7 +1351,7 @@ "reportableChange": 0 }, { - "name": "BatteryCommonDesignation", + "name": "BatCommonDesignation", "code": 20, "mfgCode": null, "side": "server", @@ -1367,7 +1367,7 @@ "reportableChange": 0 }, { - "name": "BatteryANSIDesignation", + "name": "BatANSIDesignation", "code": 21, "mfgCode": null, "side": "server", @@ -1383,7 +1383,7 @@ "reportableChange": 0 }, { - "name": "BatteryIECDesignation", + "name": "BatIECDesignation", "code": 22, "mfgCode": null, "side": "server", @@ -1399,7 +1399,7 @@ "reportableChange": 0 }, { - "name": "BatteryApprovedChemistry", + "name": "BatApprovedChemistry", "code": 23, "mfgCode": null, "side": "server", @@ -1415,7 +1415,7 @@ "reportableChange": 0 }, { - "name": "BatteryCapacity", + "name": "BatCapacity", "code": 24, "mfgCode": null, "side": "server", @@ -1431,7 +1431,7 @@ "reportableChange": 0 }, { - "name": "BatteryQuantity", + "name": "BatQuantity", "code": 25, "mfgCode": null, "side": "server", @@ -1447,11 +1447,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeState", + "name": "BatChargeState", "code": 26, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeState", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1463,7 +1463,7 @@ "reportableChange": 0 }, { - "name": "BatteryTimeToFullCharge", + "name": "BatTimeToFullCharge", "code": 27, "mfgCode": null, "side": "server", @@ -1479,7 +1479,7 @@ "reportableChange": 0 }, { - "name": "BatteryFunctionalWhileCharging", + "name": "BatFunctionalWhileCharging", "code": 28, "mfgCode": null, "side": "server", @@ -1495,7 +1495,7 @@ "reportableChange": 0 }, { - "name": "BatteryChargingCurrent", + "name": "BatChargingCurrent", "code": 29, "mfgCode": null, "side": "server", @@ -1511,7 +1511,7 @@ "reportableChange": 0 }, { - "name": "ActiveBatteryChargeFaults", + "name": "ActiveBatChargeFaults", "code": 30, "mfgCode": null, "side": "server", @@ -4048,7 +4048,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OperationalStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4224,7 +4224,7 @@ "code": 26, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "SafetyStatus", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index fee787bd531ac9..d294fde5d4cddf 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -545,7 +545,7 @@ server cluster PowerSourceConfiguration = 46 { } server cluster PowerSource = 47 { - enum BatChargeFaultType : ENUM8 { + enum BatChargeFault : ENUM8 { kUnspecfied = 0; kAmbientTooHot = 1; kAmbientTooCold = 2; @@ -572,7 +572,7 @@ server cluster PowerSource = 47 { kIsNotCharging = 3; } - enum BatFaultType : ENUM8 { + enum BatFault : ENUM8 { kUnspecfied = 0; kOverTemp = 1; kUnderTemp = 2; @@ -597,7 +597,7 @@ server cluster PowerSource = 47 { kDc = 1; } - enum WiredFaultType : ENUM8 { + enum WiredFault : ENUM8 { kUnspecfied = 0; kOverVoltage = 1; kUnderVoltage = 2; @@ -610,37 +610,37 @@ server cluster PowerSource = 47 { kReplaceable = 0x8; } - readonly attribute enum8 status = 0; + readonly attribute PowerSourceStatus status = 0; readonly attribute int8u order = 1; readonly attribute char_string<60> description = 2; - readonly attribute int32u wiredAssessedInputVoltage = 3; - readonly attribute int16u wiredAssessedInputFrequency = 4; - readonly attribute enum8 wiredCurrentType = 5; - readonly attribute int32u wiredAssessedCurrent = 6; + readonly attribute nullable int32u wiredAssessedInputVoltage = 3; + readonly attribute nullable int16u wiredAssessedInputFrequency = 4; + readonly attribute WiredCurrentType wiredCurrentType = 5; + readonly attribute nullable int32u wiredAssessedCurrent = 6; readonly attribute int32u wiredNominalVoltage = 7; readonly attribute int32u wiredMaximumCurrent = 8; readonly attribute boolean wiredPresent = 9; - readonly attribute ENUM8 activeWiredFaults[] = 10; - readonly attribute int32u batteryVoltage = 11; - readonly attribute int8u batteryPercentRemaining = 12; - readonly attribute int32u batteryTimeRemaining = 13; - readonly attribute enum8 batteryChargeLevel = 14; - readonly attribute boolean batteryReplacementNeeded = 15; - readonly attribute enum8 batteryReplaceability = 16; - readonly attribute boolean batteryPresent = 17; - readonly attribute ENUM8 activeBatteryFaults[] = 18; - readonly attribute char_string<60> batteryReplacementDescription = 19; - readonly attribute int32u batteryCommonDesignation = 20; - readonly attribute char_string<20> batteryANSIDesignation = 21; - readonly attribute char_string<20> batteryIECDesignation = 22; - readonly attribute int32u batteryApprovedChemistry = 23; - readonly attribute int32u batteryCapacity = 24; - readonly attribute int8u batteryQuantity = 25; - readonly attribute enum8 batteryChargeState = 26; - readonly attribute int32u batteryTimeToFullCharge = 27; - readonly attribute boolean batteryFunctionalWhileCharging = 28; - readonly attribute int32u batteryChargingCurrent = 29; - readonly attribute ENUM8 activeBatteryChargeFaults[] = 30; + readonly attribute WiredFault activeWiredFaults[] = 10; + readonly attribute nullable int32u batVoltage = 11; + readonly attribute nullable int8u batPercentRemaining = 12; + readonly attribute nullable int32u batTimeRemaining = 13; + readonly attribute BatChargeLevel batChargeLevel = 14; + readonly attribute boolean batReplacementNeeded = 15; + readonly attribute BatReplaceability batReplaceability = 16; + readonly attribute boolean batPresent = 17; + readonly attribute BatFault activeBatFaults[] = 18; + readonly attribute char_string<60> batReplacementDescription = 19; + readonly attribute int32u batCommonDesignation = 20; + readonly attribute char_string<20> batANSIDesignation = 21; + readonly attribute char_string<20> batIECDesignation = 22; + readonly attribute int32u batApprovedChemistry = 23; + readonly attribute int32u batCapacity = 24; + readonly attribute int8u batQuantity = 25; + readonly attribute BatChargeState batChargeState = 26; + readonly attribute nullable int32u batTimeToFullCharge = 27; + readonly attribute boolean batFunctionalWhileCharging = 28; + readonly attribute nullable int32u batChargingCurrent = 29; + readonly attribute BatChargeFault activeBatChargeFaults[] = 30; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; } @@ -2671,26 +2671,26 @@ endpoint 0 { ram attribute wiredMaximumCurrent; ram attribute wiredPresent; callback attribute activeWiredFaults; - ram attribute batteryVoltage; - ram attribute batteryPercentRemaining; - ram attribute batteryTimeRemaining; - ram attribute batteryChargeLevel; - ram attribute batteryReplacementNeeded; - ram attribute batteryReplaceability; - ram attribute batteryPresent; - callback attribute activeBatteryFaults; - ram attribute batteryReplacementDescription; - ram attribute batteryCommonDesignation; - ram attribute batteryANSIDesignation; - ram attribute batteryIECDesignation; - ram attribute batteryApprovedChemistry; - ram attribute batteryCapacity; - ram attribute batteryQuantity; - ram attribute batteryChargeState; - ram attribute batteryTimeToFullCharge; - ram attribute batteryFunctionalWhileCharging; - ram attribute batteryChargingCurrent; - callback attribute activeBatteryChargeFaults; + ram attribute batVoltage; + ram attribute batPercentRemaining; + ram attribute batTimeRemaining; + ram attribute batChargeLevel; + ram attribute batReplacementNeeded; + ram attribute batReplaceability; + ram attribute batPresent; + callback attribute activeBatFaults; + ram attribute batReplacementDescription; + ram attribute batCommonDesignation; + ram attribute batANSIDesignation; + ram attribute batIECDesignation; + ram attribute batApprovedChemistry; + ram attribute batCapacity; + ram attribute batQuantity; + ram attribute batChargeState; + ram attribute batTimeToFullCharge; + ram attribute batFunctionalWhileCharging; + ram attribute batChargingCurrent; + callback attribute activeBatChargeFaults; ram attribute featureMap; ram attribute clusterRevision default = 1; } diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index 8ad332d5c6c6ab..6dbef1dca7c2ed 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -1,5 +1,5 @@ { - "featureLevel": 71, + "featureLevel": 72, "creator": "zap", "keyValuePairs": [ { @@ -1035,7 +1035,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "PowerSourceStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1115,7 +1115,7 @@ "code": 5, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "WiredCurrentType", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1207,7 +1207,7 @@ "reportableChange": 0 }, { - "name": "BatteryVoltage", + "name": "BatVoltage", "code": 11, "mfgCode": null, "side": "server", @@ -1223,7 +1223,7 @@ "reportableChange": 0 }, { - "name": "BatteryPercentRemaining", + "name": "BatPercentRemaining", "code": 12, "mfgCode": null, "side": "server", @@ -1239,7 +1239,7 @@ "reportableChange": 0 }, { - "name": "BatteryTimeRemaining", + "name": "BatTimeRemaining", "code": 13, "mfgCode": null, "side": "server", @@ -1255,11 +1255,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeLevel", + "name": "BatChargeLevel", "code": 14, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeLevel", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1271,7 +1271,7 @@ "reportableChange": 0 }, { - "name": "BatteryReplacementNeeded", + "name": "BatReplacementNeeded", "code": 15, "mfgCode": null, "side": "server", @@ -1287,11 +1287,11 @@ "reportableChange": 0 }, { - "name": "BatteryReplaceability", + "name": "BatReplaceability", "code": 16, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatReplaceability", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1303,7 +1303,7 @@ "reportableChange": 0 }, { - "name": "BatteryPresent", + "name": "BatPresent", "code": 17, "mfgCode": null, "side": "server", @@ -1319,7 +1319,7 @@ "reportableChange": 0 }, { - "name": "ActiveBatteryFaults", + "name": "ActiveBatFaults", "code": 18, "mfgCode": null, "side": "server", @@ -1335,7 +1335,7 @@ "reportableChange": 0 }, { - "name": "BatteryReplacementDescription", + "name": "BatReplacementDescription", "code": 19, "mfgCode": null, "side": "server", @@ -1351,7 +1351,7 @@ "reportableChange": 0 }, { - "name": "BatteryCommonDesignation", + "name": "BatCommonDesignation", "code": 20, "mfgCode": null, "side": "server", @@ -1367,7 +1367,7 @@ "reportableChange": 0 }, { - "name": "BatteryANSIDesignation", + "name": "BatANSIDesignation", "code": 21, "mfgCode": null, "side": "server", @@ -1383,7 +1383,7 @@ "reportableChange": 0 }, { - "name": "BatteryIECDesignation", + "name": "BatIECDesignation", "code": 22, "mfgCode": null, "side": "server", @@ -1399,7 +1399,7 @@ "reportableChange": 0 }, { - "name": "BatteryApprovedChemistry", + "name": "BatApprovedChemistry", "code": 23, "mfgCode": null, "side": "server", @@ -1415,7 +1415,7 @@ "reportableChange": 0 }, { - "name": "BatteryCapacity", + "name": "BatCapacity", "code": 24, "mfgCode": null, "side": "server", @@ -1431,7 +1431,7 @@ "reportableChange": 0 }, { - "name": "BatteryQuantity", + "name": "BatQuantity", "code": 25, "mfgCode": null, "side": "server", @@ -1447,11 +1447,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeState", + "name": "BatChargeState", "code": 26, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeState", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1463,7 +1463,7 @@ "reportableChange": 0 }, { - "name": "BatteryTimeToFullCharge", + "name": "BatTimeToFullCharge", "code": 27, "mfgCode": null, "side": "server", @@ -1479,7 +1479,7 @@ "reportableChange": 0 }, { - "name": "BatteryFunctionalWhileCharging", + "name": "BatFunctionalWhileCharging", "code": 28, "mfgCode": null, "side": "server", @@ -1495,7 +1495,7 @@ "reportableChange": 0 }, { - "name": "BatteryChargingCurrent", + "name": "BatChargingCurrent", "code": 29, "mfgCode": null, "side": "server", @@ -1511,7 +1511,7 @@ "reportableChange": 0 }, { - "name": "ActiveBatteryChargeFaults", + "name": "ActiveBatChargeFaults", "code": 30, "mfgCode": null, "side": "server", @@ -4048,7 +4048,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OperationalStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4224,7 +4224,7 @@ "code": 26, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "SafetyStatus", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 9b67464b74c07f..c899c4af42fba7 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -551,7 +551,7 @@ server cluster UnitLocalization = 45 { } server cluster PowerSource = 47 { - enum BatChargeFaultType : ENUM8 { + enum BatChargeFault : ENUM8 { kUnspecfied = 0; kAmbientTooHot = 1; kAmbientTooCold = 2; @@ -578,7 +578,7 @@ server cluster PowerSource = 47 { kIsNotCharging = 3; } - enum BatFaultType : ENUM8 { + enum BatFault : ENUM8 { kUnspecfied = 0; kOverTemp = 1; kUnderTemp = 2; @@ -603,7 +603,7 @@ server cluster PowerSource = 47 { kDc = 1; } - enum WiredFaultType : ENUM8 { + enum WiredFault : ENUM8 { kUnspecfied = 0; kOverVoltage = 1; kUnderVoltage = 2; @@ -616,15 +616,15 @@ server cluster PowerSource = 47 { kReplaceable = 0x8; } - readonly attribute enum8 status = 0; + readonly attribute PowerSourceStatus status = 0; readonly attribute int8u order = 1; readonly attribute char_string<60> description = 2; - readonly attribute int32u batteryVoltage = 11; - readonly attribute int8u batteryPercentRemaining = 12; - readonly attribute int32u batteryTimeRemaining = 13; - readonly attribute enum8 batteryChargeLevel = 14; - readonly attribute ENUM8 activeBatteryFaults[] = 18; - readonly attribute enum8 batteryChargeState = 26; + readonly attribute nullable int32u batVoltage = 11; + readonly attribute nullable int8u batPercentRemaining = 12; + readonly attribute nullable int32u batTimeRemaining = 13; + readonly attribute BatChargeLevel batChargeLevel = 14; + readonly attribute BatFault activeBatFaults[] = 18; + readonly attribute BatChargeState batChargeState = 26; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; } @@ -1673,12 +1673,12 @@ endpoint 0 { ram attribute status; ram attribute order; ram attribute description; - ram attribute batteryVoltage; - ram attribute batteryPercentRemaining; - ram attribute batteryTimeRemaining; - ram attribute batteryChargeLevel; - callback attribute activeBatteryFaults; - ram attribute batteryChargeState; + ram attribute batVoltage; + ram attribute batPercentRemaining; + ram attribute batTimeRemaining; + ram attribute batChargeLevel; + callback attribute activeBatFaults; + ram attribute batChargeState; ram attribute featureMap; ram attribute clusterRevision default = 1; } diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index 6d97a2b6a54e9e..3a85ea58e04356 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 71, + "featureLevel": 72, "creator": "zap", "keyValuePairs": [ { @@ -90,7 +90,7 @@ "commands": [], "attributes": [ { - "name": "IdentifyTime", + "name": "identify time", "code": 0, "mfgCode": null, "side": "server", @@ -106,7 +106,7 @@ "reportableChange": 0 }, { - "name": "IdentifyType", + "name": "identify type", "code": 1, "mfgCode": null, "side": "server", @@ -322,7 +322,7 @@ ], "attributes": [ { - "name": "NameSupport", + "name": "name support", "code": 0, "mfgCode": null, "side": "server", @@ -792,7 +792,7 @@ "commands": [], "attributes": [ { - "name": "DeviceList", + "name": "device list", "code": 0, "mfgCode": null, "side": "server", @@ -808,7 +808,7 @@ "reportableChange": 0 }, { - "name": "ServerList", + "name": "server list", "code": 1, "mfgCode": null, "side": "server", @@ -824,7 +824,7 @@ "reportableChange": 0 }, { - "name": "ClientList", + "name": "client list", "code": 2, "mfgCode": null, "side": "server", @@ -840,7 +840,7 @@ "reportableChange": 0 }, { - "name": "PartsList", + "name": "parts list", "code": 3, "mfgCode": null, "side": "server", @@ -2404,7 +2404,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "PowerSourceStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2448,7 +2448,7 @@ "reportableChange": 0 }, { - "name": "BatteryVoltage", + "name": "BatVoltage", "code": 11, "mfgCode": null, "side": "server", @@ -2464,7 +2464,7 @@ "reportableChange": 0 }, { - "name": "BatteryPercentRemaining", + "name": "BatPercentRemaining", "code": 12, "mfgCode": null, "side": "server", @@ -2480,7 +2480,7 @@ "reportableChange": 0 }, { - "name": "BatteryTimeRemaining", + "name": "BatTimeRemaining", "code": 13, "mfgCode": null, "side": "server", @@ -2496,11 +2496,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeLevel", + "name": "BatChargeLevel", "code": 14, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeLevel", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2512,7 +2512,7 @@ "reportableChange": 0 }, { - "name": "ActiveBatteryFaults", + "name": "ActiveBatFaults", "code": 18, "mfgCode": null, "side": "server", @@ -2528,11 +2528,11 @@ "reportableChange": 0 }, { - "name": "BatteryChargeState", + "name": "BatChargeState", "code": 26, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "BatChargeState", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6209,7 +6209,7 @@ "commands": [], "attributes": [ { - "name": "IdentifyTime", + "name": "identify time", "code": 0, "mfgCode": null, "side": "server", @@ -6225,7 +6225,7 @@ "reportableChange": 0 }, { - "name": "IdentifyType", + "name": "identify type", "code": 1, "mfgCode": null, "side": "server", @@ -6441,7 +6441,7 @@ ], "attributes": [ { - "name": "NameSupport", + "name": "name support", "code": 0, "mfgCode": null, "side": "server", @@ -6919,7 +6919,7 @@ "commands": [], "attributes": [ { - "name": "DeviceList", + "name": "device list", "code": 0, "mfgCode": null, "side": "server", @@ -6935,7 +6935,7 @@ "reportableChange": 0 }, { - "name": "ServerList", + "name": "server list", "code": 1, "mfgCode": null, "side": "server", @@ -6951,7 +6951,7 @@ "reportableChange": 0 }, { - "name": "ClientList", + "name": "client list", "code": 2, "mfgCode": null, "side": "server", @@ -6967,7 +6967,7 @@ "reportableChange": 0 }, { - "name": "PartsList", + "name": "parts list", "code": 3, "mfgCode": null, "side": "server", @@ -7439,7 +7439,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OperationalStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7615,7 +7615,7 @@ "code": 26, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "SafetyStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7753,7 +7753,7 @@ "commands": [], "attributes": [ { - "name": "IdentifyTime", + "name": "identify time", "code": 0, "mfgCode": null, "side": "server", @@ -7769,7 +7769,7 @@ "reportableChange": 0 }, { - "name": "IdentifyType", + "name": "identify type", "code": 1, "mfgCode": null, "side": "server", @@ -7985,7 +7985,7 @@ ], "attributes": [ { - "name": "NameSupport", + "name": "name support", "code": 0, "mfgCode": null, "side": "server", @@ -8463,7 +8463,7 @@ "commands": [], "attributes": [ { - "name": "DeviceList", + "name": "device list", "code": 0, "mfgCode": null, "side": "server", @@ -8479,7 +8479,7 @@ "reportableChange": 0 }, { - "name": "ServerList", + "name": "server list", "code": 1, "mfgCode": null, "side": "server", @@ -8495,7 +8495,7 @@ "reportableChange": 0 }, { - "name": "ClientList", + "name": "client list", "code": 2, "mfgCode": null, "side": "server", @@ -8511,7 +8511,7 @@ "reportableChange": 0 }, { - "name": "PartsList", + "name": "parts list", "code": 3, "mfgCode": null, "side": "server", @@ -8983,7 +8983,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OperationalStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9159,7 +9159,7 @@ "code": 26, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "SafetyStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9283,6 +9283,5 @@ "endpointVersion": 2, "deviceIdentifier": 514 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/src/app/clusters/power-source-server/power-source-server.cpp b/src/app/clusters/power-source-server/power-source-server.cpp index 95b19fd5be564a..d813e568f64fc3 100644 --- a/src/app/clusters/power-source-server/power-source-server.cpp +++ b/src/app/clusters/power-source-server/power-source-server.cpp @@ -51,7 +51,7 @@ CHIP_ERROR PowerSourceAttrAccess::Read(const ConcreteReadAttributePath & aPath, switch (aPath.mAttributeId) { - case ActiveBatteryFaults::Id: + case ActiveBatFaults::Id: // TODO: Needs implementation. err = aEncoder.EncodeEmptyList(); break; diff --git a/src/app/tests/suites/certification/Test_TC_PS_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PS_2_1.yaml index 6034c6eaf08151..d407c33dd02441 100644 --- a/src/app/tests/suites/certification/Test_TC_PS_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PS_2_1.yaml @@ -131,7 +131,7 @@ tests: - label: "Test Harness Client reads BatVoltage from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A000b command: "readAttribute" - attribute: "BatteryVoltage" + attribute: "BatVoltage" response: constraints: type: uint32 @@ -139,7 +139,7 @@ tests: - label: "Test Harness Client reads BatPercentRemaining from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A000c command: "readAttribute" - attribute: "BatteryPercentRemaining" + attribute: "BatPercentRemaining" response: constraints: type: uint8 @@ -149,7 +149,7 @@ tests: - label: "Test Harness Client reads BatTimeRemaining from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A000d command: "readAttribute" - attribute: "BatteryTimeRemaining" + attribute: "BatTimeRemaining" response: constraints: type: uint32 @@ -157,7 +157,7 @@ tests: - label: "Test Harness Client reads BatChargeLevel from Server DUT" PICS: PS.S.A000e command: "readAttribute" - attribute: "BatteryChargeLevel" + attribute: "BatChargeLevel" response: constraints: type: enum8 @@ -167,7 +167,7 @@ tests: - label: "Test Harness Client reads BatReplacementNeeded from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A000f command: "readAttribute" - attribute: "BatteryReplacementNeeded" + attribute: "BatReplacementNeeded" response: constraints: type: bool @@ -175,7 +175,7 @@ tests: - label: "Test Harness Client reads BatReplaceability from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A0010 command: "readAttribute" - attribute: "BatteryReplaceability" + attribute: "BatReplaceability" response: constraints: type: enum8 @@ -185,7 +185,7 @@ tests: - label: "Test Harness Client reads BatPresent from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A0011 command: "readAttribute" - attribute: "BatteryPresent" + attribute: "BatPresent" response: constraints: type: bool @@ -193,7 +193,7 @@ tests: - label: "Test Harness Client readsActiveBatFaults from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A0012 command: "readAttribute" - attribute: "ActiveBatteryFaults" + attribute: "ActiveBatFaults" response: constraints: type: list @@ -203,7 +203,7 @@ tests: "Test Harness Client reads BatReplacementDescription from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A0013 command: "readAttribute" - attribute: "BatteryReplacementDescription" + attribute: "BatReplacementDescription" response: constraints: type: string @@ -212,7 +212,7 @@ tests: - label: "Test Harness Client reads BatCommonDesignation from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A0014 command: "readAttribute" - attribute: "BatteryCommonDesignation" + attribute: "BatCommonDesignation" response: constraints: type: uint32 @@ -222,7 +222,7 @@ tests: - label: "Test Harness Client reads BatANSIDesignation from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A0015 command: "readAttribute" - attribute: "BatteryANSIDesignation" + attribute: "BatANSIDesignation" response: constraints: type: string @@ -231,7 +231,7 @@ tests: - label: "Test Harness Client reads BatIECDesignation from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A0016 command: "readAttribute" - attribute: "BatteryIECDesignation" + attribute: "BatIECDesignation" response: constraints: type: string @@ -240,7 +240,7 @@ tests: - label: "Test Harness Client reads BatApprovedChemistry from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A0017 command: "readAttribute" - attribute: "BatteryApprovedChemistry" + attribute: "BatApprovedChemistry" response: constraints: type: uint32 @@ -250,7 +250,7 @@ tests: - label: "Test Harness Client reads BatCapacity from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A0018 command: "readAttribute" - attribute: "BatteryCapacity" + attribute: "BatCapacity" response: constraints: type: uint32 @@ -258,7 +258,7 @@ tests: - label: "Test Harness Client reads BatQuantity from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A0019 command: "readAttribute" - attribute: "BatteryQuantity" + attribute: "BatQuantity" response: constraints: type: uint8 @@ -266,7 +266,7 @@ tests: - label: "Test Harness Client reads BatChargeState from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A001a command: "readAttribute" - attribute: "BatteryChargeState" + attribute: "BatChargeState" response: constraints: type: enum8 @@ -276,7 +276,7 @@ tests: - label: "Test Harness Client reads BatTimeToFullCharge from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A001b command: "readAttribute" - attribute: "BatteryTimeToFullCharge" + attribute: "BatTimeToFullCharge" response: constraints: type: uint32 @@ -285,7 +285,7 @@ tests: "Test Harness Client reads BatFunctionalWhileCharging from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A001c command: "readAttribute" - attribute: "BatteryFunctionalWhileCharging" + attribute: "BatFunctionalWhileCharging" response: constraints: type: bool @@ -293,7 +293,7 @@ tests: - label: "Test Harness Client reads BatChargingCurrent from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A001d command: "readAttribute" - attribute: "BatteryChargingCurrent" + attribute: "BatChargingCurrent" response: constraints: type: uint32 @@ -301,7 +301,7 @@ tests: - label: "Test Harness Client reads ActiveBatChargeFaults from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A001e command: "readAttribute" - attribute: "ActiveBatteryChargeFaults" + attribute: "ActiveBatChargeFaults" response: constraints: type: list diff --git a/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml index c3540b2bbb8d6c..28ba55b9f30983 100644 --- a/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml @@ -24,44 +24,40 @@ limitations under the License. true true This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. - - Status + Status Order Description - WiredAssessedInputVoltage - WiredAssessedInputFrequency - WiredCurrentType - WiredAssessedCurrent + + WiredAssessedInputVoltage + WiredAssessedInputFrequency + WiredCurrentType + WiredAssessedCurrent WiredNominalVoltage WiredMaximumCurrent WiredPresent - ActiveWiredFaults - BatteryVoltage - BatteryPercentRemaining - BatteryTimeRemaining - BatteryChargeLevel - BatteryReplacementNeeded - BatteryReplaceability - BatteryPresent - ActiveBatteryFaults - BatteryReplacementDescription - BatteryCommonDesignation - BatteryANSIDesignation - BatteryIECDesignation - BatteryApprovedChemistry - BatteryCapacity - BatteryQuantity - BatteryChargeState - BatteryTimeToFullCharge - BatteryFunctionalWhileCharging - BatteryChargingCurrent - ActiveBatteryChargeFaults + ActiveWiredFaults + + BatVoltage + BatPercentRemaining + BatTimeRemaining + BatChargeLevel + BatReplacementNeeded + BatReplaceability + BatPresent + ActiveBatFaults + BatReplacementDescription + BatCommonDesignation + BatANSIDesignation + BatIECDesignation + BatApprovedChemistry + BatCapacity + BatQuantity + BatChargeState + BatTimeToFullCharge + BatFunctionalWhileCharging + BatChargingCurrent + ActiveBatChargeFaults