Skip to content

Commit

Permalink
Merge branch 'master' into tc_cent_4_3_automate
Browse files Browse the repository at this point in the history
  • Loading branch information
@khodya
khodya authored Feb 25, 2025
2 parents 0982449 + ba98125 commit c11a8c2
Show file tree
Hide file tree
Showing 16 changed files with 848 additions and 319 deletions.
378 changes: 293 additions & 85 deletions examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
View file

Large diffs are not rendered by default.

335 changes: 256 additions & 79 deletions examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap
View file

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion examples/platform/infineon/cyw30739/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ static_library("platform") {

public_configs = [ ":${target_name}-config" ]

deps = [ app_data_model ]
deps = [
"${chip_root}/src/app:generic-test-event-trigger-handler",
app_data_model,
]
}

config("platform-config") {
Expand Down
43 changes: 34 additions & 9 deletions examples/rvc-app/rvc-common/rvc-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,23 @@ cluster BasicInformation = 40 {
command MfgSpecificPing(): DefaultSuccess = 0;
}

/** Nodes should be expected to be deployed to any and all regions of the world. These global regions
may have differing common languages, units of measurements, and numerical formatting
standards. As such, Nodes that visually or audibly convey information need a mechanism by which
they can be configured to use a user’s preferred language, units, etc */
cluster LocalizationConfiguration = 43 {
revision 1; // NOTE: Default/not specifically set

attribute access(write: manage) char_string<35> activeLocale = 0;
readonly attribute char_string supportedLocales[] = 1;
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;
}

/** This cluster is used to manage global aspects of the Commissioning flow. */
cluster GeneralCommissioning = 48 {
revision 1; // NOTE: Default/not specifically set
Expand Down Expand Up @@ -1576,7 +1593,7 @@ provisional cluster ServiceArea = 336 {
}

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


server cluster Descriptor {
Expand All @@ -1592,7 +1609,6 @@ endpoint 0 {
emits event AccessControlEntryChanged;
emits event AccessControlExtensionChanged;
callback attribute acl;
callback attribute extension;
callback attribute subjectsPerAccessControlEntry;
callback attribute targetsPerAccessControlEntry;
callback attribute accessControlEntriesPerFabric;
Expand Down Expand Up @@ -1627,7 +1643,17 @@ endpoint 0 {
callback attribute specificationVersion;
callback attribute maxPathsPerInvoke;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
ram attribute clusterRevision default = 4;
}

server cluster LocalizationConfiguration {
ram attribute activeLocale;
callback attribute supportedLocales;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
}

server cluster GeneralCommissioning {
Expand All @@ -1637,7 +1663,7 @@ endpoint 0 {
callback attribute locationCapability;
callback attribute supportsConcurrentConnection;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 0x0001;
ram attribute clusterRevision default = 0x0002;

handle command ArmFailSafe;
handle command ArmFailSafeResponse;
Expand All @@ -1650,8 +1676,6 @@ 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;
Expand All @@ -1675,6 +1699,7 @@ endpoint 0 {
ram attribute clusterRevision default = 1;

handle command RetrieveLogsRequest;
handle command RetrieveLogsResponse;
}

server cluster GeneralDiagnostics {
Expand Down Expand Up @@ -1751,7 +1776,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type ma_robotic_vacuum_cleaner = 116, version 1;
device type ma_robotic_vacuum_cleaner = 116, version 3;


server cluster Identify {
Expand All @@ -1761,7 +1786,7 @@ 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;
Expand Down Expand Up @@ -1817,7 +1842,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;

handle command Pause;
handle command Resume;
Expand Down
190 changes: 136 additions & 54 deletions examples/rvc-app/rvc-common/rvc-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
}
],
"deviceVersions": [
1
3
],
"deviceIdentifiers": [
22
Expand Down Expand Up @@ -193,22 +193,6 @@
"maxInterval": 65534,
"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,
Expand Down Expand Up @@ -693,7 +677,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "3",
"defaultValue": "4",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -724,6 +708,128 @@
}
]
},
{
"name": "Localization Configuration",
"code": 43,
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
{
"name": "ActiveLocale",
"code": 0,
"mfgCode": null,
"side": "server",
"type": "char_string",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "SupportedLocales",
"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": "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,
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
}
]
},
{
"name": "General Commissioning",
"code": 48,
Expand Down Expand Up @@ -888,7 +994,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0001",
"defaultValue": "0x0002",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -1010,38 +1116,6 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ScanMaxTimeSeconds",
"code": 2,
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ConnectMaxTimeSeconds",
"code": 3,
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "InterfaceEnabled",
"code": 4,
Expand Down Expand Up @@ -1155,6 +1229,14 @@
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "RetrieveLogsResponse",
"code": 1,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
Expand Down Expand Up @@ -1983,7 +2065,7 @@
}
],
"deviceVersions": [
1
3
],
"deviceIdentifiers": [
116
Expand Down Expand Up @@ -2124,7 +2206,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "4",
"defaultValue": "5",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -2762,7 +2844,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
Loading

0 comments on commit c11a8c2

Please sign in to comment.