[NXP] Update Thermostat ZAP files to fix IDM errors (#36612)
Signed-off-by: Martin Girardot <martin.girardot@nxp.com>
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_br.matter b/examples/thermostat/nxp/zap/thermostat_matter_br.matter
index f38e2b1..8a8d69f 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_br.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_br.matter
@@ -341,83 +341,6 @@
command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
}
-/** Attributes and commands for group configuration and manipulation. */
-cluster Groups = 4 {
- revision 4;
-
- bitmap Feature : bitmap32 {
- kGroupNames = 0x1;
- }
-
- bitmap NameSupportBitmap : bitmap8 {
- kGroupNames = 0x80;
- }
-
- readonly attribute NameSupportBitmap nameSupport = 0;
- readonly attribute command_id generatedCommandList[] = 65528;
- readonly attribute command_id acceptedCommandList[] = 65529;
- readonly attribute event_id eventList[] = 65530;
- readonly attribute attrib_id attributeList[] = 65531;
- readonly attribute bitmap32 featureMap = 65532;
- readonly attribute int16u clusterRevision = 65533;
-
- request struct AddGroupRequest {
- group_id groupID = 0;
- char_string<16> groupName = 1;
- }
-
- response struct AddGroupResponse = 0 {
- enum8 status = 0;
- group_id groupID = 1;
- }
-
- request struct ViewGroupRequest {
- group_id groupID = 0;
- }
-
- response struct ViewGroupResponse = 1 {
- enum8 status = 0;
- group_id groupID = 1;
- char_string<16> groupName = 2;
- }
-
- request struct GetGroupMembershipRequest {
- group_id groupList[] = 0;
- }
-
- response struct GetGroupMembershipResponse = 2 {
- nullable int8u capacity = 0;
- group_id groupList[] = 1;
- }
-
- request struct RemoveGroupRequest {
- group_id groupID = 0;
- }
-
- response struct RemoveGroupResponse = 3 {
- enum8 status = 0;
- group_id groupID = 1;
- }
-
- request struct AddGroupIfIdentifyingRequest {
- group_id groupID = 0;
- char_string<16> groupName = 1;
- }
-
- /** Command description for AddGroup */
- fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
- /** Command description for ViewGroup */
- fabric command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
- /** Command description for GetGroupMembership */
- fabric command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
- /** Command description for RemoveGroup */
- fabric command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
- /** Command description for RemoveAllGroups */
- fabric command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
- /** Command description for AddGroupIfIdentifying */
- fabric command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
/** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
cluster Descriptor = 29 {
revision 2;
@@ -2249,6 +2172,7 @@
endpoint 0 {
device type ma_rootdevice = 22, version 1;
+ device type ma_otarequestor = 18, version 1;
binding cluster OtaSoftwareUpdateProvider;
@@ -2257,6 +2181,9 @@
callback attribute serverList;
callback attribute clientList;
callback attribute partsList;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
callback attribute featureMap;
callback attribute clusterRevision;
}
@@ -2265,10 +2192,11 @@
emits event AccessControlEntryChanged;
emits event AccessControlExtensionChanged;
callback attribute acl;
- callback attribute extension;
callback attribute subjectsPerAccessControlEntry;
callback attribute targetsPerAccessControlEntry;
callback attribute accessControlEntriesPerFabric;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute clusterRevision;
@@ -2276,25 +2204,17 @@
server cluster BasicInformation {
emits event StartUp;
- emits event ShutDown;
- emits event Leave;
callback attribute dataModelRevision;
callback attribute vendorName;
callback attribute vendorID;
callback attribute productName;
callback attribute productID;
- persist attribute nodeLabel;
+ ram attribute nodeLabel;
callback attribute location;
callback attribute hardwareVersion;
callback attribute hardwareVersionString;
callback attribute softwareVersion;
callback attribute softwareVersionString;
- callback attribute manufacturingDate;
- callback attribute partNumber;
- callback attribute productURL;
- callback attribute productLabel;
- callback attribute serialNumber;
- persist attribute localConfigDisabled default = 0;
callback attribute uniqueID;
callback attribute capabilityMinima;
callback attribute specificationVersion;
@@ -2303,7 +2223,7 @@
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 3;
+ ram attribute clusterRevision default = 4;
}
server cluster OtaSoftwareUpdateRequestor {
@@ -2314,6 +2234,9 @@
ram attribute updatePossible default = 1;
ram attribute updateState default = 0;
ram attribute updateStateProgress default = 0;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
@@ -2326,8 +2249,11 @@
callback attribute regulatoryConfig;
callback attribute locationCapability;
callback attribute supportsConcurrentConnection;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 1;
+ ram attribute clusterRevision default = 2;
handle command ArmFailSafe;
handle command ArmFailSafeResponse;
@@ -2351,7 +2277,7 @@
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 1;
- ram attribute clusterRevision default = 1;
+ ram attribute clusterRevision default = 3;
handle command ScanNetworks;
handle command ScanNetworksResponse;
@@ -2404,9 +2330,14 @@
callback attribute attributeList;
callback attribute featureMap;
ram attribute clusterRevision default = 1;
+
+ handle command ResetWatermarks;
}
server cluster WiFiNetworkDiagnostics {
+ emits event Disconnection;
+ emits event AssociationFailure;
+ emits event ConnectionStatus;
callback attribute bssid;
callback attribute securityType;
callback attribute wiFiVersion;
@@ -2423,7 +2354,7 @@
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
- ram attribute featureMap default = 0;
+ ram attribute featureMap default = 3;
ram attribute clusterRevision default = 1;
handle command ResetCounts;
@@ -2433,6 +2364,9 @@
callback attribute windowStatus;
callback attribute adminFabricIndex;
callback attribute adminVendorId;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
@@ -2447,6 +2381,9 @@
callback attribute commissionedFabrics;
callback attribute trustedRootCertificates;
callback attribute currentFabricIndex;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
@@ -2469,6 +2406,9 @@
callback attribute groupTable;
callback attribute maxGroupsPerFabric;
callback attribute maxGroupKeysPerFabric;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
callback attribute featureMap;
callback attribute clusterRevision;
@@ -2492,29 +2432,12 @@
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 4;
+ ram attribute clusterRevision default = 5;
handle command Identify;
handle command TriggerEffect;
}
- server cluster Groups {
- ram attribute nameSupport;
- ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 4;
-
- handle command AddGroup;
- handle command AddGroupResponse;
- handle command ViewGroup;
- handle command ViewGroupResponse;
- handle command GetGroupMembership;
- handle command GetGroupMembershipResponse;
- handle command RemoveGroup;
- handle command RemoveGroupResponse;
- handle command RemoveAllGroups;
- handle command AddGroupIfIdentifying;
- }
-
server cluster Descriptor {
callback attribute deviceTypeList;
callback attribute serverList;
@@ -2557,7 +2480,7 @@
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x3;
- ram attribute clusterRevision default = 7;
+ ram attribute clusterRevision default = 8;
handle command SetpointRaiseLower;
}
@@ -2593,8 +2516,8 @@
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
- ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 1;
+ ram attribute featureMap default = 2;
+ ram attribute clusterRevision default = 2;
handle command ScanNetworks;
handle command ScanNetworksResponse;
@@ -2665,9 +2588,6 @@
callback attribute rxErrSecCount;
callback attribute rxErrFcsCount;
callback attribute rxErrOtherCount;
- callback attribute activeTimestamp;
- callback attribute pendingTimestamp;
- callback attribute delay;
callback attribute securityPolicy;
callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
@@ -2675,8 +2595,8 @@
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
- ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 2;
+ ram attribute featureMap default = 0x000F;
+ ram attribute clusterRevision default = 3;
handle command ResetCounts;
}
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_br.zap b/examples/thermostat/nxp/zap/thermostat_matter_br.zap
index ea67cd0..b4973ba 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_br.zap
+++ b/examples/thermostat/nxp/zap/thermostat_matter_br.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 104,
"creator": "zap",
"keyValuePairs": [
{
@@ -38,27 +38,38 @@
"id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
- "code": 22,
+ "code": 18,
"profileId": 259,
- "label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "label": "MA-otarequestor",
+ "name": "MA-otarequestor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
+ "code": 18,
+ "profileId": 259,
+ "label": "MA-otarequestor",
+ "name": "MA-otarequestor",
+ "deviceTypeOrder": 0
+ },
+ {
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
+ 1,
1
],
"deviceIdentifiers": [
+ 18,
22
],
- "deviceTypeName": "MA-rootdevice",
- "deviceTypeCode": 22,
+ "deviceTypeName": "MA-otarequestor",
+ "deviceTypeCode": 18,
"deviceTypeProfileId": 259,
"clusters": [
{
@@ -134,6 +145,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -192,22 +251,6 @@
"reportableChange": 0
},
{
- "name": "Extension",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SubjectsPerAccessControlEntry",
"code": 2,
"mfgCode": null,
@@ -256,6 +299,38 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -341,8 +416,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -357,8 +432,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -373,8 +448,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -389,8 +464,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -405,8 +480,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -416,13 +491,13 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "NVM",
+ "storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -437,8 +512,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -453,8 +528,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -469,8 +544,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -485,8 +560,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -501,104 +576,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ManufacturingDate",
- "code": 11,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "PartNumber",
- "code": 12,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ProductURL",
- "code": 13,
- "mfgCode": null,
- "side": "server",
- "type": "long_char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ProductLabel",
- "code": 14,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "SerialNumber",
- "code": 15,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "LocalConfigDisabled",
- "code": 16,
- "mfgCode": null,
- "side": "server",
- "type": "boolean",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -613,8 +592,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -625,7 +604,7 @@
"type": "CapabilityMinimaStruct",
"included": 1,
"storageOption": "External",
- "singleton": 0,
+ "singleton": 1,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
@@ -698,22 +677,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -737,7 +700,7 @@
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
- "singleton": 0,
+ "singleton": 1,
"bounded": 0,
"defaultValue": "0",
"reportable": 1,
@@ -755,10 +718,10 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "3",
+ "defaultValue": "4",
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
}
],
@@ -769,20 +732,6 @@
"mfgCode": null,
"side": "server",
"included": 1
- },
- {
- "name": "ShutDown",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "included": 1
- },
- {
- "name": "Leave",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "included": 1
}
]
},
@@ -919,6 +868,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -1114,6 +1111,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -1139,7 +1184,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1406,22 +1451,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1463,7 +1492,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "3",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1530,22 +1559,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1758,22 +1771,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1839,6 +1836,16 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
+ "commands": [
+ {
+ "name": "ResetWatermarks",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "isIncoming": 1,
+ "isEnabled": 1
+ }
+ ],
"attributes": [
{
"name": "ThreadMetrics",
@@ -1937,22 +1944,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2261,22 +2252,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2302,7 +2277,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": "3",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2324,6 +2299,29 @@
"maxInterval": 65344,
"reportableChange": 0
}
+ ],
+ "events": [
+ {
+ "name": "Disconnection",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1
+ },
+ {
+ "name": "AssociationFailure",
+ "code": 1,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1
+ },
+ {
+ "name": "ConnectionStatus",
+ "code": 2,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1
+ }
]
},
{
@@ -2401,6 +2399,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -2637,6 +2683,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -2793,6 +2887,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -2835,14 +2977,16 @@
"code": 769,
"profileId": 259,
"label": "MA-thermostat",
- "name": "MA-thermostat"
+ "name": "MA-thermostat",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 769,
"profileId": 259,
"label": "MA-thermostat",
- "name": "MA-thermostat"
+ "name": "MA-thermostat",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2972,22 +3116,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3029,147 +3157,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "4",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Groups",
- "code": 4,
- "mfgCode": null,
- "define": "GROUPS_CLUSTER",
- "side": "server",
- "enabled": 1,
- "commands": [
- {
- "name": "AddGroup",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- },
- {
- "name": "AddGroupResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "isIncoming": 0,
- "isEnabled": 1
- },
- {
- "name": "ViewGroup",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- },
- {
- "name": "ViewGroupResponse",
- "code": 1,
- "mfgCode": null,
- "source": "server",
- "isIncoming": 0,
- "isEnabled": 1
- },
- {
- "name": "GetGroupMembership",
- "code": 2,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- },
- {
- "name": "GetGroupMembershipResponse",
- "code": 2,
- "mfgCode": null,
- "source": "server",
- "isIncoming": 0,
- "isEnabled": 1
- },
- {
- "name": "RemoveGroup",
- "code": 3,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- },
- {
- "name": "RemoveGroupResponse",
- "code": 3,
- "mfgCode": null,
- "source": "server",
- "isIncoming": 0,
- "isEnabled": 1
- },
- {
- "name": "RemoveAllGroups",
- "code": 4,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- },
- {
- "name": "AddGroupIfIdentifying",
- "code": 5,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- }
- ],
- "attributes": [
- {
- "name": "NameSupport",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "NameSupportBitmap",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "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": "4",
+ "defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -3308,22 +3296,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -3414,22 +3386,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3779,7 +3735,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "7",
+ "defaultValue": "8",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -3796,20 +3752,23 @@
"code": 25,
"profileId": 259,
"label": "MA-secondary-network-interface",
- "name": "MA-secondary-network-interface"
+ "name": "MA-secondary-network-interface",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 25,
"profileId": 259,
"label": "MA-secondary-network-interface",
- "name": "MA-secondary-network-interface"
+ "name": "MA-secondary-network-interface",
+ "deviceTypeOrder": 0
},
{
"code": 145,
"profileId": 259,
"label": "MA-thread-border-router",
- "name": "MA-thread-border-router"
+ "name": "MA-thread-border-router",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -3929,22 +3888,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4261,22 +4204,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4302,7 +4229,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4318,7 +4245,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -5241,54 +5168,6 @@
"reportableChange": 0
},
{
- "name": "ActiveTimestamp",
- "code": 56,
- "mfgCode": null,
- "side": "server",
- "type": "int64u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "PendingTimestamp",
- "code": 57,
- "mfgCode": null,
- "side": "server",
- "type": "int64u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "Delay",
- "code": 58,
- "mfgCode": null,
- "side": "server",
- "type": "int32u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SecurityPolicy",
"code": 59,
"mfgCode": null,
@@ -5385,22 +5264,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5426,7 +5289,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": "0x000F",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -5442,7 +5305,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "2",
+ "defaultValue": "3",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -5646,22 +5509,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
index 4c6b26a..a2a2f2d 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
@@ -341,83 +341,6 @@
command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
}
-/** Attributes and commands for group configuration and manipulation. */
-cluster Groups = 4 {
- revision 4;
-
- bitmap Feature : bitmap32 {
- kGroupNames = 0x1;
- }
-
- bitmap NameSupportBitmap : bitmap8 {
- kGroupNames = 0x80;
- }
-
- readonly attribute NameSupportBitmap nameSupport = 0;
- readonly attribute command_id generatedCommandList[] = 65528;
- readonly attribute command_id acceptedCommandList[] = 65529;
- readonly attribute event_id eventList[] = 65530;
- readonly attribute attrib_id attributeList[] = 65531;
- readonly attribute bitmap32 featureMap = 65532;
- readonly attribute int16u clusterRevision = 65533;
-
- request struct AddGroupRequest {
- group_id groupID = 0;
- char_string<16> groupName = 1;
- }
-
- response struct AddGroupResponse = 0 {
- enum8 status = 0;
- group_id groupID = 1;
- }
-
- request struct ViewGroupRequest {
- group_id groupID = 0;
- }
-
- response struct ViewGroupResponse = 1 {
- enum8 status = 0;
- group_id groupID = 1;
- char_string<16> groupName = 2;
- }
-
- request struct GetGroupMembershipRequest {
- group_id groupList[] = 0;
- }
-
- response struct GetGroupMembershipResponse = 2 {
- nullable int8u capacity = 0;
- group_id groupList[] = 1;
- }
-
- request struct RemoveGroupRequest {
- group_id groupID = 0;
- }
-
- response struct RemoveGroupResponse = 3 {
- enum8 status = 0;
- group_id groupID = 1;
- }
-
- request struct AddGroupIfIdentifyingRequest {
- group_id groupID = 0;
- char_string<16> groupName = 1;
- }
-
- /** Command description for AddGroup */
- fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
- /** Command description for ViewGroup */
- fabric command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
- /** Command description for GetGroupMembership */
- fabric command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
- /** Command description for RemoveGroup */
- fabric command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
- /** Command description for RemoveAllGroups */
- fabric command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
- /** Command description for AddGroupIfIdentifying */
- fabric command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
/** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
cluster Descriptor = 29 {
revision 2;
@@ -2128,6 +2051,7 @@
endpoint 0 {
device type ma_rootdevice = 22, version 1;
+ device type ma_otarequestor = 18, version 1;
binding cluster OtaSoftwareUpdateProvider;
@@ -2136,6 +2060,9 @@
callback attribute serverList;
callback attribute clientList;
callback attribute partsList;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
callback attribute featureMap;
callback attribute clusterRevision;
}
@@ -2144,10 +2071,11 @@
emits event AccessControlEntryChanged;
emits event AccessControlExtensionChanged;
callback attribute acl;
- callback attribute extension;
callback attribute subjectsPerAccessControlEntry;
callback attribute targetsPerAccessControlEntry;
callback attribute accessControlEntriesPerFabric;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute clusterRevision;
@@ -2155,25 +2083,17 @@
server cluster BasicInformation {
emits event StartUp;
- emits event ShutDown;
- emits event Leave;
callback attribute dataModelRevision;
callback attribute vendorName;
callback attribute vendorID;
callback attribute productName;
callback attribute productID;
- persist attribute nodeLabel;
+ ram attribute nodeLabel;
callback attribute location;
callback attribute hardwareVersion;
callback attribute hardwareVersionString;
callback attribute softwareVersion;
callback attribute softwareVersionString;
- callback attribute manufacturingDate;
- callback attribute partNumber;
- callback attribute productURL;
- callback attribute productLabel;
- callback attribute serialNumber;
- persist attribute localConfigDisabled default = 0;
callback attribute uniqueID;
callback attribute capabilityMinima;
callback attribute specificationVersion;
@@ -2182,7 +2102,7 @@
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 3;
+ ram attribute clusterRevision default = 4;
}
server cluster OtaSoftwareUpdateRequestor {
@@ -2193,6 +2113,9 @@
ram attribute updatePossible default = 1;
ram attribute updateState default = 0;
ram attribute updateStateProgress default = 0;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
@@ -2205,8 +2128,11 @@
callback attribute regulatoryConfig;
callback attribute locationCapability;
callback attribute supportsConcurrentConnection;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 1;
+ ram attribute clusterRevision default = 2;
handle command ArmFailSafe;
handle command ArmFailSafeResponse;
@@ -2235,7 +2161,6 @@
handle command ScanNetworks;
handle command ScanNetworksResponse;
- handle command AddOrUpdateWiFiNetwork;
handle command AddOrUpdateThreadNetwork;
handle command RemoveNetwork;
handle command NetworkConfigResponse;
@@ -2284,6 +2209,8 @@
callback attribute attributeList;
callback attribute featureMap;
ram attribute clusterRevision default = 1;
+
+ handle command ResetWatermarks;
}
server cluster ThreadNetworkDiagnostics {
@@ -2345,9 +2272,6 @@
callback attribute rxErrSecCount;
callback attribute rxErrFcsCount;
callback attribute rxErrOtherCount;
- callback attribute activeTimestamp;
- callback attribute pendingTimestamp;
- callback attribute delay;
callback attribute securityPolicy;
callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
@@ -2356,7 +2280,7 @@
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x000F;
- ram attribute clusterRevision default = 2;
+ ram attribute clusterRevision default = 3;
handle command ResetCounts;
}
@@ -2365,6 +2289,9 @@
callback attribute windowStatus;
callback attribute adminFabricIndex;
callback attribute adminVendorId;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
@@ -2379,6 +2306,9 @@
callback attribute commissionedFabrics;
callback attribute trustedRootCertificates;
callback attribute currentFabricIndex;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
@@ -2401,6 +2331,9 @@
callback attribute groupTable;
callback attribute maxGroupsPerFabric;
callback attribute maxGroupKeysPerFabric;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
callback attribute featureMap;
callback attribute clusterRevision;
@@ -2424,29 +2357,12 @@
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 4;
+ ram attribute clusterRevision default = 5;
handle command Identify;
handle command TriggerEffect;
}
- server cluster Groups {
- ram attribute nameSupport;
- ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 4;
-
- handle command AddGroup;
- handle command AddGroupResponse;
- handle command ViewGroup;
- handle command ViewGroupResponse;
- handle command GetGroupMembership;
- handle command GetGroupMembershipResponse;
- handle command RemoveGroup;
- handle command RemoveGroupResponse;
- handle command RemoveAllGroups;
- handle command AddGroupIfIdentifying;
- }
-
server cluster Descriptor {
callback attribute deviceTypeList;
callback attribute serverList;
@@ -2489,7 +2405,7 @@
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x3;
- ram attribute clusterRevision default = 7;
+ ram attribute clusterRevision default = 8;
handle command SetpointRaiseLower;
}
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap
index 21241a6..8917a97 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap
+++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 104,
"creator": "zap",
"keyValuePairs": [
{
@@ -38,27 +38,38 @@
"id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
- "code": 22,
+ "code": 18,
"profileId": 259,
- "label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "label": "MA-otarequestor",
+ "name": "MA-otarequestor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
+ "code": 18,
+ "profileId": 259,
+ "label": "MA-otarequestor",
+ "name": "MA-otarequestor",
+ "deviceTypeOrder": 0
+ },
+ {
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
+ 1,
1
],
"deviceIdentifiers": [
+ 18,
22
],
- "deviceTypeName": "MA-rootdevice",
- "deviceTypeCode": 22,
+ "deviceTypeName": "MA-otarequestor",
+ "deviceTypeCode": 18,
"deviceTypeProfileId": 259,
"clusters": [
{
@@ -134,6 +145,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -192,22 +251,6 @@
"reportableChange": 0
},
{
- "name": "Extension",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SubjectsPerAccessControlEntry",
"code": 2,
"mfgCode": null,
@@ -256,6 +299,38 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -341,8 +416,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -357,8 +432,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -373,8 +448,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -389,8 +464,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -405,8 +480,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -416,13 +491,13 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "NVM",
+ "storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -437,8 +512,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -453,8 +528,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -469,8 +544,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -485,8 +560,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -501,104 +576,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ManufacturingDate",
- "code": 11,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "PartNumber",
- "code": 12,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ProductURL",
- "code": 13,
- "mfgCode": null,
- "side": "server",
- "type": "long_char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ProductLabel",
- "code": 14,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "SerialNumber",
- "code": 15,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "LocalConfigDisabled",
- "code": 16,
- "mfgCode": null,
- "side": "server",
- "type": "boolean",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -613,8 +592,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -625,7 +604,7 @@
"type": "CapabilityMinimaStruct",
"included": 1,
"storageOption": "External",
- "singleton": 0,
+ "singleton": 1,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
@@ -698,22 +677,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -737,7 +700,7 @@
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
- "singleton": 0,
+ "singleton": 1,
"bounded": 0,
"defaultValue": "0",
"reportable": 1,
@@ -755,10 +718,10 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "3",
+ "defaultValue": "4",
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
}
],
@@ -769,20 +732,6 @@
"mfgCode": null,
"side": "server",
"included": 1
- },
- {
- "name": "ShutDown",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "included": 1
- },
- {
- "name": "Leave",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "included": 1
}
]
},
@@ -919,6 +868,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -1114,6 +1111,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -1139,7 +1184,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1172,14 +1217,6 @@
"isEnabled": 1
},
{
- "name": "AddOrUpdateWiFiNetwork",
- "code": 2,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- },
- {
"name": "AddOrUpdateThreadNetwork",
"code": 3,
"mfgCode": null,
@@ -1422,22 +1459,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1546,22 +1567,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1774,22 +1779,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1855,6 +1844,16 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
+ "commands": [
+ {
+ "name": "ResetWatermarks",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "isIncoming": 1,
+ "isEnabled": 1
+ }
+ ],
"attributes": [
{
"name": "ThreadMetrics",
@@ -1953,22 +1952,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2933,54 +2916,6 @@
"reportableChange": 0
},
{
- "name": "ActiveTimestamp",
- "code": 56,
- "mfgCode": null,
- "side": "server",
- "type": "int64u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "PendingTimestamp",
- "code": 57,
- "mfgCode": null,
- "side": "server",
- "type": "int64u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "Delay",
- "code": 58,
- "mfgCode": null,
- "side": "server",
- "type": "int32u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SecurityPolicy",
"code": 59,
"mfgCode": null,
@@ -3118,7 +3053,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "2",
+ "defaultValue": "3",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -3217,6 +3152,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -3453,6 +3436,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -3609,6 +3640,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -3651,14 +3730,16 @@
"code": 769,
"profileId": 259,
"label": "MA-thermostat",
- "name": "MA-thermostat"
+ "name": "MA-thermostat",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 769,
"profileId": 259,
"label": "MA-thermostat",
- "name": "MA-thermostat"
+ "name": "MA-thermostat",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3788,22 +3869,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3845,147 +3910,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "4",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Groups",
- "code": 4,
- "mfgCode": null,
- "define": "GROUPS_CLUSTER",
- "side": "server",
- "enabled": 1,
- "commands": [
- {
- "name": "AddGroup",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- },
- {
- "name": "AddGroupResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "isIncoming": 0,
- "isEnabled": 1
- },
- {
- "name": "ViewGroup",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- },
- {
- "name": "ViewGroupResponse",
- "code": 1,
- "mfgCode": null,
- "source": "server",
- "isIncoming": 0,
- "isEnabled": 1
- },
- {
- "name": "GetGroupMembership",
- "code": 2,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- },
- {
- "name": "GetGroupMembershipResponse",
- "code": 2,
- "mfgCode": null,
- "source": "server",
- "isIncoming": 0,
- "isEnabled": 1
- },
- {
- "name": "RemoveGroup",
- "code": 3,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- },
- {
- "name": "RemoveGroupResponse",
- "code": 3,
- "mfgCode": null,
- "source": "server",
- "isIncoming": 0,
- "isEnabled": 1
- },
- {
- "name": "RemoveAllGroups",
- "code": 4,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- },
- {
- "name": "AddGroupIfIdentifying",
- "code": 5,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- }
- ],
- "attributes": [
- {
- "name": "NameSupport",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "NameSupportBitmap",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "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": "4",
+ "defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -4124,22 +4049,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -4230,22 +4139,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4595,7 +4488,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "7",
+ "defaultValue": "8",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
index 9b09b05..b5b2456 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
@@ -341,83 +341,6 @@
command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
}
-/** Attributes and commands for group configuration and manipulation. */
-cluster Groups = 4 {
- revision 4;
-
- bitmap Feature : bitmap32 {
- kGroupNames = 0x1;
- }
-
- bitmap NameSupportBitmap : bitmap8 {
- kGroupNames = 0x80;
- }
-
- readonly attribute NameSupportBitmap nameSupport = 0;
- readonly attribute command_id generatedCommandList[] = 65528;
- readonly attribute command_id acceptedCommandList[] = 65529;
- readonly attribute event_id eventList[] = 65530;
- readonly attribute attrib_id attributeList[] = 65531;
- readonly attribute bitmap32 featureMap = 65532;
- readonly attribute int16u clusterRevision = 65533;
-
- request struct AddGroupRequest {
- group_id groupID = 0;
- char_string<16> groupName = 1;
- }
-
- response struct AddGroupResponse = 0 {
- enum8 status = 0;
- group_id groupID = 1;
- }
-
- request struct ViewGroupRequest {
- group_id groupID = 0;
- }
-
- response struct ViewGroupResponse = 1 {
- enum8 status = 0;
- group_id groupID = 1;
- char_string<16> groupName = 2;
- }
-
- request struct GetGroupMembershipRequest {
- group_id groupList[] = 0;
- }
-
- response struct GetGroupMembershipResponse = 2 {
- nullable int8u capacity = 0;
- group_id groupList[] = 1;
- }
-
- request struct RemoveGroupRequest {
- group_id groupID = 0;
- }
-
- response struct RemoveGroupResponse = 3 {
- enum8 status = 0;
- group_id groupID = 1;
- }
-
- request struct AddGroupIfIdentifyingRequest {
- group_id groupID = 0;
- char_string<16> groupName = 1;
- }
-
- /** Command description for AddGroup */
- fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
- /** Command description for ViewGroup */
- fabric command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
- /** Command description for GetGroupMembership */
- fabric command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
- /** Command description for RemoveGroup */
- fabric command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
- /** Command description for RemoveAllGroups */
- fabric command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
- /** Command description for AddGroupIfIdentifying */
- fabric command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
/** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
cluster Descriptor = 29 {
revision 2;
@@ -2039,6 +1962,7 @@
endpoint 0 {
device type ma_rootdevice = 22, version 1;
+ device type ma_otarequestor = 18, version 1;
binding cluster OtaSoftwareUpdateProvider;
@@ -2047,6 +1971,9 @@
callback attribute serverList;
callback attribute clientList;
callback attribute partsList;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
callback attribute featureMap;
callback attribute clusterRevision;
}
@@ -2055,10 +1982,11 @@
emits event AccessControlEntryChanged;
emits event AccessControlExtensionChanged;
callback attribute acl;
- callback attribute extension;
callback attribute subjectsPerAccessControlEntry;
callback attribute targetsPerAccessControlEntry;
callback attribute accessControlEntriesPerFabric;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
callback attribute clusterRevision;
@@ -2066,25 +1994,17 @@
server cluster BasicInformation {
emits event StartUp;
- emits event ShutDown;
- emits event Leave;
callback attribute dataModelRevision;
callback attribute vendorName;
callback attribute vendorID;
callback attribute productName;
callback attribute productID;
- persist attribute nodeLabel;
+ ram attribute nodeLabel;
callback attribute location;
callback attribute hardwareVersion;
callback attribute hardwareVersionString;
callback attribute softwareVersion;
callback attribute softwareVersionString;
- callback attribute manufacturingDate;
- callback attribute partNumber;
- callback attribute productURL;
- callback attribute productLabel;
- callback attribute serialNumber;
- persist attribute localConfigDisabled default = 0;
callback attribute uniqueID;
callback attribute capabilityMinima;
callback attribute specificationVersion;
@@ -2093,7 +2013,7 @@
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 3;
+ ram attribute clusterRevision default = 4;
}
server cluster OtaSoftwareUpdateRequestor {
@@ -2104,6 +2024,9 @@
ram attribute updatePossible default = 1;
ram attribute updateState default = 0;
ram attribute updateStateProgress default = 0;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
@@ -2116,8 +2039,11 @@
callback attribute regulatoryConfig;
callback attribute locationCapability;
callback attribute supportsConcurrentConnection;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 1;
+ ram attribute clusterRevision default = 2;
handle command ArmFailSafe;
handle command ArmFailSafeResponse;
@@ -2141,7 +2067,7 @@
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 1;
- ram attribute clusterRevision default = 1;
+ ram attribute clusterRevision default = 3;
handle command ScanNetworks;
handle command ScanNetworksResponse;
@@ -2194,6 +2120,8 @@
callback attribute attributeList;
callback attribute featureMap;
ram attribute clusterRevision default = 1;
+
+ handle command ResetWatermarks;
}
server cluster WiFiNetworkDiagnostics {
@@ -2216,7 +2144,7 @@
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
- ram attribute featureMap default = 0;
+ ram attribute featureMap default = 3;
ram attribute clusterRevision default = 1;
handle command ResetCounts;
@@ -2226,6 +2154,9 @@
callback attribute windowStatus;
callback attribute adminFabricIndex;
callback attribute adminVendorId;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
@@ -2240,6 +2171,9 @@
callback attribute commissionedFabrics;
callback attribute trustedRootCertificates;
callback attribute currentFabricIndex;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
@@ -2262,6 +2196,9 @@
callback attribute groupTable;
callback attribute maxGroupsPerFabric;
callback attribute maxGroupKeysPerFabric;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute attributeList;
callback attribute featureMap;
callback attribute clusterRevision;
@@ -2285,29 +2222,12 @@
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 4;
+ ram attribute clusterRevision default = 5;
handle command Identify;
handle command TriggerEffect;
}
- server cluster Groups {
- ram attribute nameSupport;
- ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 4;
-
- handle command AddGroup;
- handle command AddGroupResponse;
- handle command ViewGroup;
- handle command ViewGroupResponse;
- handle command GetGroupMembership;
- handle command GetGroupMembershipResponse;
- handle command RemoveGroup;
- handle command RemoveGroupResponse;
- handle command RemoveAllGroups;
- handle command AddGroupIfIdentifying;
- }
-
server cluster Descriptor {
callback attribute deviceTypeList;
callback attribute serverList;
@@ -2350,7 +2270,7 @@
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x3;
- ram attribute clusterRevision default = 7;
+ ram attribute clusterRevision default = 8;
handle command SetpointRaiseLower;
}
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap
index 9a50852..7012d1b 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap
+++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 104,
"creator": "zap",
"keyValuePairs": [
{
@@ -38,27 +38,38 @@
"id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
- "code": 22,
+ "code": 18,
"profileId": 259,
- "label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "label": "MA-otarequestor",
+ "name": "MA-otarequestor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
+ "code": 18,
+ "profileId": 259,
+ "label": "MA-otarequestor",
+ "name": "MA-otarequestor",
+ "deviceTypeOrder": 0
+ },
+ {
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
+ 1,
1
],
"deviceIdentifiers": [
+ 18,
22
],
- "deviceTypeName": "MA-rootdevice",
- "deviceTypeCode": 22,
+ "deviceTypeName": "MA-otarequestor",
+ "deviceTypeCode": 18,
"deviceTypeProfileId": 259,
"clusters": [
{
@@ -134,6 +145,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -192,22 +251,6 @@
"reportableChange": 0
},
{
- "name": "Extension",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SubjectsPerAccessControlEntry",
"code": 2,
"mfgCode": null,
@@ -256,6 +299,38 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -341,8 +416,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -357,8 +432,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -373,8 +448,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -389,8 +464,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -405,8 +480,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -416,13 +491,13 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "NVM",
+ "storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -437,8 +512,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -453,8 +528,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -469,8 +544,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -485,8 +560,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -501,104 +576,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ManufacturingDate",
- "code": 11,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "PartNumber",
- "code": 12,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ProductURL",
- "code": 13,
- "mfgCode": null,
- "side": "server",
- "type": "long_char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ProductLabel",
- "code": 14,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "SerialNumber",
- "code": 15,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "LocalConfigDisabled",
- "code": 16,
- "mfgCode": null,
- "side": "server",
- "type": "boolean",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -613,8 +592,8 @@
"bounded": 0,
"defaultValue": null,
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
},
{
@@ -625,7 +604,7 @@
"type": "CapabilityMinimaStruct",
"included": 1,
"storageOption": "External",
- "singleton": 0,
+ "singleton": 1,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
@@ -698,22 +677,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -737,7 +700,7 @@
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
- "singleton": 0,
+ "singleton": 1,
"bounded": 0,
"defaultValue": "0",
"reportable": 1,
@@ -755,10 +718,10 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "3",
+ "defaultValue": "4",
"reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
+ "minInterval": 1,
+ "maxInterval": 65534,
"reportableChange": 0
}
],
@@ -769,20 +732,6 @@
"mfgCode": null,
"side": "server",
"included": 1
- },
- {
- "name": "ShutDown",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "included": 1
- },
- {
- "name": "Leave",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "included": 1
}
]
},
@@ -919,6 +868,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -1114,6 +1111,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -1139,7 +1184,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1406,22 +1451,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1463,7 +1492,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "3",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1530,22 +1559,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1758,22 +1771,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1839,6 +1836,16 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
+ "commands": [
+ {
+ "name": "ResetWatermarks",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "isIncoming": 1,
+ "isEnabled": 1
+ }
+ ],
"attributes": [
{
"name": "ThreadMetrics",
@@ -1937,22 +1944,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2174,7 +2165,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2222,7 +2213,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2261,22 +2252,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2302,7 +2277,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": "3",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2424,6 +2399,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -2660,6 +2683,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -2816,6 +2887,54 @@
"reportableChange": 0
},
{
+ "name": "GeneratedCommandList",
+ "code": 65528,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AcceptedCommandList",
+ "code": 65529,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AttributeList",
+ "code": 65531,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": null,
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -2858,14 +2977,16 @@
"code": 769,
"profileId": 259,
"label": "MA-thermostat",
- "name": "MA-thermostat"
+ "name": "MA-thermostat",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 769,
"profileId": 259,
"label": "MA-thermostat",
- "name": "MA-thermostat"
+ "name": "MA-thermostat",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2995,22 +3116,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3052,147 +3157,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "4",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Groups",
- "code": 4,
- "mfgCode": null,
- "define": "GROUPS_CLUSTER",
- "side": "server",
- "enabled": 1,
- "commands": [
- {
- "name": "AddGroup",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- },
- {
- "name": "AddGroupResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "isIncoming": 0,
- "isEnabled": 1
- },
- {
- "name": "ViewGroup",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- },
- {
- "name": "ViewGroupResponse",
- "code": 1,
- "mfgCode": null,
- "source": "server",
- "isIncoming": 0,
- "isEnabled": 1
- },
- {
- "name": "GetGroupMembership",
- "code": 2,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- },
- {
- "name": "GetGroupMembershipResponse",
- "code": 2,
- "mfgCode": null,
- "source": "server",
- "isIncoming": 0,
- "isEnabled": 1
- },
- {
- "name": "RemoveGroup",
- "code": 3,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- },
- {
- "name": "RemoveGroupResponse",
- "code": 3,
- "mfgCode": null,
- "source": "server",
- "isIncoming": 0,
- "isEnabled": 1
- },
- {
- "name": "RemoveAllGroups",
- "code": 4,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- },
- {
- "name": "AddGroupIfIdentifying",
- "code": 5,
- "mfgCode": null,
- "source": "client",
- "isIncoming": 1,
- "isEnabled": 1
- }
- ],
- "attributes": [
- {
- "name": "NameSupport",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "NameSupportBitmap",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "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": "4",
+ "defaultValue": "5",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -3331,22 +3296,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
@@ -3437,22 +3386,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3802,7 +3735,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "7",
+ "defaultValue": "8",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
diff --git a/src/platform/nxp/common/DiagnosticDataProviderImpl.h b/src/platform/nxp/common/DiagnosticDataProviderImpl.h
index 27b2e35..2137d63 100644
--- a/src/platform/nxp/common/DiagnosticDataProviderImpl.h
+++ b/src/platform/nxp/common/DiagnosticDataProviderImpl.h
@@ -40,9 +40,7 @@
// ===== Methods that implement the PlatformManager abstract interface.
-#if NXP_USE_MML
bool SupportsWatermarks() override { return true; }
-#endif
CHIP_ERROR GetCurrentHeapFree(uint64_t & currentHeapFree) override;
CHIP_ERROR GetCurrentHeapUsed(uint64_t & currentHeapUsed) override;
CHIP_ERROR GetCurrentHeapHighWatermark(uint64_t & currentHeapHighWatermark) override;
