Skip to content

Commit

Permalink
Changes for DeviceConformance in the Thermostat-app (#37054)
Browse files Browse the repository at this point in the history 
* Fixes for DeviceConformance tests

* Restore OTA Requester on EP0

* Adding OTA Requestor to device type
  • Loading branch information
@tersal
tersal authored Jan 16, 2025
1 parent 2a09f8b commit 283d764
Show file tree
Hide file tree
Showing 2 changed files with 592 additions and 116 deletions.
55 changes: 42 additions & 13 deletions examples/thermostat/thermostat-common/thermostat.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2388,7 +2388,8 @@ cluster ThermostatUserInterfaceConfiguration = 516 {
}

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

binding cluster OtaSoftwareUpdateProvider;

Expand All @@ -2397,6 +2398,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 @@ -2411,10 +2415,11 @@ 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;
Expand Down Expand Up @@ -2445,8 +2450,11 @@ endpoint 0 {
callback attribute capabilityMinima;
callback attribute specificationVersion;
callback attribute maxPathsPerInvoke;
callback attribute generatedCommandList;
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 @@ -2457,6 +2465,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 @@ -2466,14 +2477,15 @@ endpoint 0 {
server cluster LocalizationConfiguration {
persist attribute activeLocale default = "en-US";
callback attribute supportedLocales;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
}

server cluster TimeFormatLocalization {
persist attribute hourFormat default = 0;
persist attribute activeCalendarType default = 0;
callback attribute supportedCalendarTypes;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
}
Expand All @@ -2490,8 +2502,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 @@ -2504,12 +2519,13 @@ endpoint 0 {
server cluster NetworkCommissioning {
ram attribute maxNetworks;
callback attribute networks;
ram attribute scanMaxTimeSeconds;
ram attribute connectMaxTimeSeconds;
ram attribute interfaceEnabled;
ram attribute lastNetworkingStatus;
ram attribute lastNetworkID;
ram attribute lastConnectErrorValue;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 2;
ram attribute clusterRevision default = 1;

Expand Down Expand Up @@ -2543,6 +2559,9 @@ endpoint 0 {
callback attribute activeRadioFaults;
callback attribute activeNetworkFaults;
callback attribute testEventTriggersEnabled default = false;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
callback attribute featureMap;
callback attribute clusterRevision;

Expand Down Expand Up @@ -2625,7 +2644,7 @@ endpoint 0 {
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
ram attribute clusterRevision default = 2;
ram attribute clusterRevision default = 3;

handle command ResetCounts;
}
Expand Down Expand Up @@ -2665,12 +2684,17 @@ endpoint 0 {
callback attribute timeSinceReset;
ram attribute featureMap default = 3;
ram attribute clusterRevision default = 1;

handle command ResetCounts;
}

server cluster AdministratorCommissioning {
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 @@ -2685,6 +2709,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 @@ -2707,6 +2734,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 @@ -2731,15 +2761,15 @@ endpoint 0 {
}
}
endpoint 1 {
device type ma_thermostat = 769, version 1;
device type ma_thermostat = 769, version 4;

binding cluster Identify;

server cluster Identify {
ram attribute identifyTime default = 0x0000;
ram attribute identifyType default = 0x0;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 4;
ram attribute clusterRevision default = 5;

handle command Identify;
handle command TriggerEffect;
Expand Down Expand Up @@ -2796,10 +2826,9 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x123;
ram attribute clusterRevision default = 7;
ram attribute clusterRevision default = 8;

handle command SetpointRaiseLower;
handle command SetActiveScheduleRequest;
handle command SetActivePresetRequest;
handle command AtomicResponse;
handle command AtomicRequest;
Expand Down
Loading

0 comments on commit 283d764

Please sign in to comment.