Skip to content

Commit 80b4fe1

Browse files
bzbarsky-applebzbarsky-apple
authored
Switch Descriptor to using a global SemanticTagStruct, to match the spec. (project-chip#41270)
Fixes project-chip#34702
1 parent 9f8eb75 commit 80b4fe1

File tree

149 files changed

+1163
-1157
lines changed

Some content is hidden

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

149 files changed

+1163
-1157
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,13 @@ struct PowerThresholdStruct {
324324
nullable PowerThresholdSourceEnum powerThresholdSource = 2;
325325
}
326326

327+
struct SemanticTagStruct {
328+
nullable vendor_id mfgCode = 0;
329+
enum8 namespaceID = 1;
330+
enum8 tag = 2;
331+
optional nullable char_string<64> label = 3;
332+
}
333+
327334
struct TestGlobalStruct {
328335
char_string<128> name = 0;
329336
nullable TestGlobalBitmap myBitmap = 1;
@@ -481,13 +488,6 @@ cluster Descriptor = 29 {
481488
int16u revision = 1;
482489
}
483490

484-
struct SemanticTagStruct {
485-
nullable vendor_id mfgCode = 0;
486-
enum8 namespaceID = 1;
487-
enum8 tag = 2;
488-
optional nullable char_string<64> label = 3;
489-
}
490-
491491
readonly attribute DeviceTypeStruct deviceTypeList[] = 0;
492492
readonly attribute cluster_id serverList[] = 1;
493493
readonly attribute cluster_id clientList[] = 2;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,13 @@ struct PowerThresholdStruct {
324324
nullable PowerThresholdSourceEnum powerThresholdSource = 2;
325325
}
326326

327+
struct SemanticTagStruct {
328+
nullable vendor_id mfgCode = 0;
329+
enum8 namespaceID = 1;
330+
enum8 tag = 2;
331+
optional nullable char_string<64> label = 3;
332+
}
333+
327334
struct TestGlobalStruct {
328335
char_string<128> name = 0;
329336
nullable TestGlobalBitmap myBitmap = 1;
@@ -410,13 +417,6 @@ cluster Descriptor = 29 {
410417
int16u revision = 1;
411418
}
412419

413-
struct SemanticTagStruct {
414-
nullable vendor_id mfgCode = 0;
415-
enum8 namespaceID = 1;
416-
enum8 tag = 2;
417-
optional nullable char_string<64> label = 3;
418-
}
419-
420420
readonly attribute DeviceTypeStruct deviceTypeList[] = 0;
421421
readonly attribute cluster_id serverList[] = 1;
422422
readonly attribute cluster_id clientList[] = 2;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,13 @@ struct PowerThresholdStruct {
324324
nullable PowerThresholdSourceEnum powerThresholdSource = 2;
325325
}
326326

327+
struct SemanticTagStruct {
328+
nullable vendor_id mfgCode = 0;
329+
enum8 namespaceID = 1;
330+
enum8 tag = 2;
331+
optional nullable char_string<64> label = 3;
332+
}
333+
327334
struct TestGlobalStruct {
328335
char_string<128> name = 0;
329336
nullable TestGlobalBitmap myBitmap = 1;
@@ -410,13 +417,6 @@ cluster Descriptor = 29 {
410417
int16u revision = 1;
411418
}
412419

413-
struct SemanticTagStruct {
414-
nullable vendor_id mfgCode = 0;
415-
enum8 namespaceID = 1;
416-
enum8 tag = 2;
417-
optional nullable char_string<64> label = 3;
418-
}
419-
420420
readonly attribute DeviceTypeStruct deviceTypeList[] = 0;
421421
readonly attribute cluster_id serverList[] = 1;
422422
readonly attribute cluster_id clientList[] = 2;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,13 @@ struct PowerThresholdStruct {
324324
nullable PowerThresholdSourceEnum powerThresholdSource = 2;
325325
}
326326

327+
struct SemanticTagStruct {
328+
nullable vendor_id mfgCode = 0;
329+
enum8 namespaceID = 1;
330+
enum8 tag = 2;
331+
optional nullable char_string<64> label = 3;
332+
}
333+
327334
struct TestGlobalStruct {
328335
char_string<128> name = 0;
329336
nullable TestGlobalBitmap myBitmap = 1;
@@ -751,13 +758,6 @@ cluster Descriptor = 29 {
751758
int16u revision = 1;
752759
}
753760

754-
struct SemanticTagStruct {
755-
nullable vendor_id mfgCode = 0;
756-
enum8 namespaceID = 1;
757-
enum8 tag = 2;
758-
optional nullable char_string<64> label = 3;
759-
}
760-
761761
readonly attribute DeviceTypeStruct deviceTypeList[] = 0;
762762
readonly attribute cluster_id serverList[] = 1;
763763
readonly attribute cluster_id clientList[] = 2;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,13 @@ struct PowerThresholdStruct {
324324
nullable PowerThresholdSourceEnum powerThresholdSource = 2;
325325
}
326326

327+
struct SemanticTagStruct {
328+
nullable vendor_id mfgCode = 0;
329+
enum8 namespaceID = 1;
330+
enum8 tag = 2;
331+
optional nullable char_string<64> label = 3;
332+
}
333+
327334
struct TestGlobalStruct {
328335
char_string<128> name = 0;
329336
nullable TestGlobalBitmap myBitmap = 1;
@@ -751,13 +758,6 @@ cluster Descriptor = 29 {
751758
int16u revision = 1;
752759
}
753760

754-
struct SemanticTagStruct {
755-
nullable vendor_id mfgCode = 0;
756-
enum8 namespaceID = 1;
757-
enum8 tag = 2;
758-
optional nullable char_string<64> label = 3;
759-
}
760-
761761
readonly attribute DeviceTypeStruct deviceTypeList[] = 0;
762762
readonly attribute cluster_id serverList[] = 1;
763763
readonly attribute cluster_id clientList[] = 2;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,13 @@ struct PowerThresholdStruct {
324324
nullable PowerThresholdSourceEnum powerThresholdSource = 2;
325325
}
326326

327+
struct SemanticTagStruct {
328+
nullable vendor_id mfgCode = 0;
329+
enum8 namespaceID = 1;
330+
enum8 tag = 2;
331+
optional nullable char_string<64> label = 3;
332+
}
333+
327334
struct TestGlobalStruct {
328335
char_string<128> name = 0;
329336
nullable TestGlobalBitmap myBitmap = 1;
@@ -680,13 +687,6 @@ cluster Descriptor = 29 {
680687
int16u revision = 1;
681688
}
682689

683-
struct SemanticTagStruct {
684-
nullable vendor_id mfgCode = 0;
685-
enum8 namespaceID = 1;
686-
enum8 tag = 2;
687-
optional nullable char_string<64> label = 3;
688-
}
689-
690690
readonly attribute DeviceTypeStruct deviceTypeList[] = 0;
691691
readonly attribute cluster_id serverList[] = 1;
692692
readonly attribute cluster_id clientList[] = 2;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,13 @@ struct PowerThresholdStruct {
324324
nullable PowerThresholdSourceEnum powerThresholdSource = 2;
325325
}
326326

327+
struct SemanticTagStruct {
328+
nullable vendor_id mfgCode = 0;
329+
enum8 namespaceID = 1;
330+
enum8 tag = 2;
331+
optional nullable char_string<64> label = 3;
332+
}
333+
327334
struct TestGlobalStruct {
328335
char_string<128> name = 0;
329336
nullable TestGlobalBitmap myBitmap = 1;
@@ -604,13 +611,6 @@ cluster Descriptor = 29 {
604611
int16u revision = 1;
605612
}
606613

607-
struct SemanticTagStruct {
608-
nullable vendor_id mfgCode = 0;
609-
enum8 namespaceID = 1;
610-
enum8 tag = 2;
611-
optional nullable char_string<64> label = 3;
612-
}
613-
614614
readonly attribute DeviceTypeStruct deviceTypeList[] = 0;
615615
readonly attribute cluster_id serverList[] = 1;
616616
readonly attribute cluster_id clientList[] = 2;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,13 @@ struct PowerThresholdStruct {
324324
nullable PowerThresholdSourceEnum powerThresholdSource = 2;
325325
}
326326

327+
struct SemanticTagStruct {
328+
nullable vendor_id mfgCode = 0;
329+
enum8 namespaceID = 1;
330+
enum8 tag = 2;
331+
optional nullable char_string<64> label = 3;
332+
}
333+
327334
struct TestGlobalStruct {
328335
char_string<128> name = 0;
329336
nullable TestGlobalBitmap myBitmap = 1;
@@ -486,13 +493,6 @@ cluster Descriptor = 29 {
486493
int16u revision = 1;
487494
}
488495

489-
struct SemanticTagStruct {
490-
nullable vendor_id mfgCode = 0;
491-
enum8 namespaceID = 1;
492-
enum8 tag = 2;
493-
optional nullable char_string<64> label = 3;
494-
}
495-
496496
readonly attribute DeviceTypeStruct deviceTypeList[] = 0;
497497
readonly attribute cluster_id serverList[] = 1;
498498
readonly attribute cluster_id clientList[] = 2;

‎examples/chef/devices/icd_rootnode_contactsensor_ed3b19ec55.matter‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,13 @@ struct PowerThresholdStruct {
324324
nullable PowerThresholdSourceEnum powerThresholdSource = 2;
325325
}
326326

327+
struct SemanticTagStruct {
328+
nullable vendor_id mfgCode = 0;
329+
enum8 namespaceID = 1;
330+
enum8 tag = 2;
331+
optional nullable char_string<64> label = 3;
332+
}
333+
327334
struct TestGlobalStruct {
328335
char_string<128> name = 0;
329336
nullable TestGlobalBitmap myBitmap = 1;
@@ -410,13 +417,6 @@ cluster Descriptor = 29 {
410417
int16u revision = 1;
411418
}
412419

413-
struct SemanticTagStruct {
414-
nullable vendor_id mfgCode = 0;
415-
enum8 namespaceID = 1;
416-
enum8 tag = 2;
417-
optional nullable char_string<64> label = 3;
418-
}
419-
420420
readonly attribute DeviceTypeStruct deviceTypeList[] = 0;
421421
readonly attribute cluster_id serverList[] = 1;
422422
readonly attribute cluster_id clientList[] = 2;

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,13 @@ struct PowerThresholdStruct {
324324
nullable PowerThresholdSourceEnum powerThresholdSource = 2;
325325
}
326326

327+
struct SemanticTagStruct {
328+
nullable vendor_id mfgCode = 0;
329+
enum8 namespaceID = 1;
330+
enum8 tag = 2;
331+
optional nullable char_string<64> label = 3;
332+
}
333+
327334
struct TestGlobalStruct {
328335
char_string<128> name = 0;
329336
nullable TestGlobalBitmap myBitmap = 1;
@@ -680,13 +687,6 @@ cluster Descriptor = 29 {
680687
int16u revision = 1;
681688
}
682689

683-
struct SemanticTagStruct {
684-
nullable vendor_id mfgCode = 0;
685-
enum8 namespaceID = 1;
686-
enum8 tag = 2;
687-
optional nullable char_string<64> label = 3;
688-
}
689-
690690
readonly attribute DeviceTypeStruct deviceTypeList[] = 0;
691691
readonly attribute cluster_id serverList[] = 1;
692692
readonly attribute cluster_id clientList[] = 2;

0 commit comments

Comments
 (0)