Skip to content

Commit

Permalink
[NXP] Update Thermostat ZAP files to fix IDM errors (#36612)
Browse files Browse the repository at this point in the history 
Signed-off-by: Martin Girardot <martin.girardot@nxp.com>
  • Loading branch information
@Martin-NXP @pull
Martin-NXP authored and pull[bot] committed Dec 5, 2024
1 parent db689a2 commit 2317992
Show file tree
Hide file tree
Showing 7 changed files with 1,415 additions and 1,988 deletions.
154 changes: 37 additions & 117 deletions examples/thermostat/nxp/zap/thermostat_matter_br.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,83 +341,6 @@ cluster Identify = 3 {
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;
Expand Down Expand Up @@ -2249,6 +2172,7 @@ provisional cluster ThreadBorderRouterManagement = 1106 {

endpoint 0 {
device type ma_rootdevice = 22, version 1;
device type ma_otarequestor = 18, version 1;

binding cluster OtaSoftwareUpdateProvider;

Expand All @@ -2257,6 +2181,9 @@ endpoint 0 {
callback attribute serverList;
callback attribute clientList;
callback attribute partsList;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
callback attribute featureMap;
callback attribute clusterRevision;
}
Expand All @@ -2265,36 +2192,29 @@ endpoint 0 {
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;
}

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;
Expand All @@ -2303,7 +2223,7 @@ endpoint 0 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
ram attribute clusterRevision default = 4;
}

server cluster OtaSoftwareUpdateRequestor {
Expand All @@ -2314,6 +2234,9 @@ endpoint 0 {
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;

Expand All @@ -2326,8 +2249,11 @@ endpoint 0 {
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;
Expand All @@ -2351,7 +2277,7 @@ endpoint 0 {
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;
Expand Down Expand Up @@ -2404,9 +2330,14 @@ endpoint 0 {
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;
Expand All @@ -2423,7 +2354,7 @@ endpoint 0 {
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;
Expand All @@ -2433,6 +2364,9 @@ endpoint 0 {
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;

Expand All @@ -2447,6 +2381,9 @@ endpoint 0 {
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;

Expand All @@ -2469,6 +2406,9 @@ endpoint 0 {
callback attribute groupTable;
callback attribute maxGroupsPerFabric;
callback attribute maxGroupKeysPerFabric;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
callback attribute featureMap;
callback attribute clusterRevision;

Expand All @@ -2492,29 +2432,12 @@ endpoint 1 {
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;
Expand Down Expand Up @@ -2557,7 +2480,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x3;
ram attribute clusterRevision default = 7;
ram attribute clusterRevision default = 8;

handle command SetpointRaiseLower;
}
Expand Down Expand Up @@ -2593,8 +2516,8 @@ endpoint 2 {
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;
Expand Down Expand Up @@ -2665,18 +2588,15 @@ endpoint 2 {
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;
callback attribute activeNetworkFaultsList;
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;
}
Expand Down
Loading

0 comments on commit 2317992

Please sign in to comment.