Skip to content

Commit 3683f59

Browse files
authored
add the DeviceLocation attribute to the Basic Information cluster XMLs (#43342)
* update XMLs with Basic Info cluster's DeviceLocation attribute * marked the DeviceLocation attribute as optional * Apply suggestion from @plauric * update XMLs using Alchemy. update the BridgedDevBasicInfo cluster. * merge from master and update the basicinfo and bridgedbasicinfo xml files * fixed missing JRE and ran regen script again * fix submodule pointer for nanopb to cfdc6487acbbf7152a8f929e175710ff49f6066a * fix issue introduced by a previous commit * fix issues introduced by a previous commit, resulting in a broken build * fix submodule pointer for nanopb to cfdc6487acbbf7152a8f929e175710ff49f6066a * fix another issue introduced by a previous commit * update after regen * missed updating in the previous commit * removed DeviceLocation from the 1.5 DM XMLs. revert the updated comments from the zap-template XMLs updated to include DeviceLocation * fix issue from previous commit: remove Python venv * revert submodule updates to the revs from 5b2553a7abb02584cbe5bd864877a688d229c03a * XML fine tuning * undo changes to global-enums.xml
1 parent 6d31890 commit 3683f59

161 files changed

Lines changed: 1054 additions & 4 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

examples/air-purifier-app/air-purifier-common/air-purifier-app.matter

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,7 @@ cluster BasicInformation = 40 {
738738
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
739739
readonly attribute optional int32u specificationVersion = 21;
740740
readonly attribute optional int16u maxPathsPerInvoke = 22;
741+
attribute access(write: administer) optional nullable LocationDescriptorStruct deviceLocation = 23;
741742
readonly attribute optional int32u configurationVersion = 24;
742743
readonly attribute command_id generatedCommandList[] = 65528;
743744
readonly attribute command_id acceptedCommandList[] = 65529;

examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -667,6 +667,7 @@ cluster BasicInformation = 40 {
667667
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
668668
readonly attribute optional int32u specificationVersion = 21;
669669
readonly attribute optional int16u maxPathsPerInvoke = 22;
670+
attribute access(write: administer) optional nullable LocationDescriptorStruct deviceLocation = 23;
670671
readonly attribute optional int32u configurationVersion = 24;
671672
readonly attribute command_id generatedCommandList[] = 65528;
672673
readonly attribute command_id acceptedCommandList[] = 65529;

examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.matter

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -667,6 +667,7 @@ cluster BasicInformation = 40 {
667667
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
668668
readonly attribute optional int32u specificationVersion = 21;
669669
readonly attribute optional int16u maxPathsPerInvoke = 22;
670+
attribute access(write: administer) optional nullable LocationDescriptorStruct deviceLocation = 23;
670671
readonly attribute optional int32u configurationVersion = 24;
671672
readonly attribute command_id generatedCommandList[] = 65528;
672673
readonly attribute command_id acceptedCommandList[] = 65529;

examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,6 +1204,7 @@ cluster BasicInformation = 40 {
12041204
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
12051205
readonly attribute optional int32u specificationVersion = 21;
12061206
readonly attribute optional int16u maxPathsPerInvoke = 22;
1207+
attribute access(write: administer) optional nullable LocationDescriptorStruct deviceLocation = 23;
12071208
readonly attribute optional int32u configurationVersion = 24;
12081209
readonly attribute command_id generatedCommandList[] = 65528;
12091210
readonly attribute command_id acceptedCommandList[] = 65529;

examples/all-clusters-app/realtek/data_model/all-clusters-app.matter

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,6 +1204,7 @@ cluster BasicInformation = 40 {
12041204
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
12051205
readonly attribute optional int32u specificationVersion = 21;
12061206
readonly attribute optional int16u maxPathsPerInvoke = 22;
1207+
attribute access(write: administer) optional nullable LocationDescriptorStruct deviceLocation = 23;
12071208
readonly attribute optional int32u configurationVersion = 24;
12081209
readonly attribute command_id generatedCommandList[] = 65528;
12091210
readonly attribute command_id acceptedCommandList[] = 65529;

examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,6 +1133,7 @@ cluster BasicInformation = 40 {
11331133
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
11341134
readonly attribute optional int32u specificationVersion = 21;
11351135
readonly attribute optional int16u maxPathsPerInvoke = 22;
1136+
attribute access(write: administer) optional nullable LocationDescriptorStruct deviceLocation = 23;
11361137
readonly attribute optional int32u configurationVersion = 24;
11371138
readonly attribute command_id generatedCommandList[] = 65528;
11381139
readonly attribute command_id acceptedCommandList[] = 65529;

examples/bridge-app/bridge-common/bridge-app.matter

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,6 +1037,7 @@ cluster BasicInformation = 40 {
10371037
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
10381038
readonly attribute optional int32u specificationVersion = 21;
10391039
readonly attribute optional int16u maxPathsPerInvoke = 22;
1040+
attribute access(write: administer) optional nullable LocationDescriptorStruct deviceLocation = 23;
10401041
readonly attribute optional int32u configurationVersion = 24;
10411042
readonly attribute command_id generatedCommandList[] = 65528;
10421043
readonly attribute command_id acceptedCommandList[] = 65529;

examples/camera-app/camera-common/camera-app.matter

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,7 @@ cluster BasicInformation = 40 {
763763
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
764764
readonly attribute optional int32u specificationVersion = 21;
765765
readonly attribute optional int16u maxPathsPerInvoke = 22;
766+
attribute access(write: administer) optional nullable LocationDescriptorStruct deviceLocation = 23;
766767
readonly attribute optional int32u configurationVersion = 24;
767768
readonly attribute command_id generatedCommandList[] = 65528;
768769
readonly attribute command_id acceptedCommandList[] = 65529;

examples/chef/devices/icd_rootnode_contactsensor_ed3b19ec55.matter

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,7 @@ cluster BasicInformation = 40 {
687687
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
688688
readonly attribute optional int32u specificationVersion = 21;
689689
readonly attribute optional int16u maxPathsPerInvoke = 22;
690+
attribute access(write: administer) optional nullable LocationDescriptorStruct deviceLocation = 23;
690691
readonly attribute optional int32u configurationVersion = 24;
691692
readonly attribute command_id generatedCommandList[] = 65528;
692693
readonly attribute command_id acceptedCommandList[] = 65529;

examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -957,6 +957,7 @@ cluster BasicInformation = 40 {
957957
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
958958
readonly attribute optional int32u specificationVersion = 21;
959959
readonly attribute optional int16u maxPathsPerInvoke = 22;
960+
attribute access(write: administer) optional nullable LocationDescriptorStruct deviceLocation = 23;
960961
readonly attribute optional int32u configurationVersion = 24;
961962
readonly attribute command_id generatedCommandList[] = 65528;
962963
readonly attribute command_id acceptedCommandList[] = 65529;

0 commit comments

Comments
 (0)