Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align naming in Mode Select cluster XML with the spec. #24345

Merged
merged 2 commits into from
Jan 10, 2023
Merged

Align naming in Mode Select cluster XML with the spec. #24345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2175a3e
Align naming in Mode Select cluster XML with the spec.
bzbarsky-apple Jan 10, 2023
32871f6
Regenerate generated code.
bzbarsky-apple Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1777,13 +1777,13 @@ server cluster ModeSelect = 80 {
}

struct ModeOptionStruct {
char_string<32> label = 0;
char_string<64> label = 0;
int8u mode = 1;
SemanticTag semanticTags[] = 2;
SemanticTagStruct semanticTags[] = 2;
}

struct SemanticTag {
enum16 mfgCode = 0;
struct SemanticTagStruct {
vendor_id mfgCode = 0;
enum16 value = 1;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using namespace chip::app::Clusters;
using namespace chip::app::Clusters::ModeSelect;

using ModeOptionStructType = Structs::ModeOptionStruct::Type;
using SemanticTag = Structs::SemanticTag::Type;
using SemanticTag = Structs::SemanticTagStruct::Type;
template <typename T>
using List = app::DataModel::List<T>;
using storage_value_type = const ModeOptionStructType;
Expand Down
8 changes: 4 additions & 4 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1622,13 +1622,13 @@ server cluster ModeSelect = 80 {
}

struct ModeOptionStruct {
char_string<32> label = 0;
char_string<64> label = 0;
int8u mode = 1;
SemanticTag semanticTags[] = 2;
SemanticTagStruct semanticTags[] = 2;
}

struct SemanticTag {
enum16 mfgCode = 0;
struct SemanticTagStruct {
vendor_id mfgCode = 0;
enum16 value = 1;
}

Expand Down
16 changes: 8 additions & 8 deletions examples/placeholder/linux/apps/app1/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1536,13 +1536,13 @@ client cluster ModeSelect = 80 {
}

struct ModeOptionStruct {
char_string<32> label = 0;
char_string<64> label = 0;
int8u mode = 1;
SemanticTag semanticTags[] = 2;
SemanticTagStruct semanticTags[] = 2;
}

struct SemanticTag {
enum16 mfgCode = 0;
struct SemanticTagStruct {
vendor_id mfgCode = 0;
enum16 value = 1;
}

Expand Down Expand Up @@ -1570,13 +1570,13 @@ server cluster ModeSelect = 80 {
}

struct ModeOptionStruct {
char_string<32> label = 0;
char_string<64> label = 0;
int8u mode = 1;
SemanticTag semanticTags[] = 2;
SemanticTagStruct semanticTags[] = 2;
}

struct SemanticTag {
enum16 mfgCode = 0;
struct SemanticTagStruct {
vendor_id mfgCode = 0;
enum16 value = 1;
}

Expand Down
16 changes: 8 additions & 8 deletions examples/placeholder/linux/apps/app2/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1513,13 +1513,13 @@ client cluster ModeSelect = 80 {
}

struct ModeOptionStruct {
char_string<32> label = 0;
char_string<64> label = 0;
int8u mode = 1;
SemanticTag semanticTags[] = 2;
SemanticTagStruct semanticTags[] = 2;
}

struct SemanticTag {
enum16 mfgCode = 0;
struct SemanticTagStruct {
vendor_id mfgCode = 0;
enum16 value = 1;
}

Expand Down Expand Up @@ -1547,13 +1547,13 @@ server cluster ModeSelect = 80 {
}

struct ModeOptionStruct {
char_string<32> label = 0;
char_string<64> label = 0;
int8u mode = 1;
SemanticTag semanticTags[] = 2;
SemanticTagStruct semanticTags[] = 2;
}

struct SemanticTag {
enum16 mfgCode = 0;
struct SemanticTagStruct {
vendor_id mfgCode = 0;
enum16 value = 1;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/placeholder/linux/static-supported-modes-manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using namespace chip::app::Clusters;
using namespace chip::app::Clusters::ModeSelect;

using ModeOptionStructType = Structs::ModeOptionStruct::Type;
using SemanticTag = Structs::SemanticTag::Type;
using SemanticTag = Structs::SemanticTagStruct::Type;
template <typename T>
using List = app::DataModel::List<T>;
using storage_value_type = const ModeOptionStructType;
Expand Down
8 changes: 4 additions & 4 deletions src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ limitations under the License.
<configurator>
<domain name="CHIP"/>

<struct name="SemanticTag">
<struct name="SemanticTagStruct">
<cluster code="0x0050"/>
<item name="MfgCode" type="ENUM16"/>
<item name="MfgCode" type="vendor_id"/>
<item name="Value" type="ENUM16" optional="false"/>
</struct>

<struct name="ModeOptionStruct">
<cluster code="0x0050"/>
<item name="Label" type="CHAR_STRING" optional="false" length="32"/>
<item name="Label" type="CHAR_STRING" optional="false" length="64"/>
<item name="Mode" type="INT8U" optional="false"/>
<item name="SemanticTags" type="SemanticTag" array="true" optional="false"/>
<item name="SemanticTags" type="SemanticTagStruct" array="true" optional="false"/>
</struct>

<cluster>
Expand Down
8 changes: 4 additions & 4 deletions src/controller/data_model/controller-clusters.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2022,13 +2022,13 @@ client cluster ModeSelect = 80 {
}

struct ModeOptionStruct {
char_string<32> label = 0;
char_string<64> label = 0;
int8u mode = 1;
SemanticTag semanticTags[] = 2;
SemanticTagStruct semanticTags[] = 2;
}

struct SemanticTag {
enum16 mfgCode = 0;
struct SemanticTagStruct {
vendor_id mfgCode = 0;
enum16 value = 1;
}

Expand Down
25 changes: 13 additions & 12 deletions src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions src/controller/java/zap-generated/CHIPReadCallbacks.cpp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/controller/python/chip/clusters/Objects.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/darwin/Framework/CHIP/templates/availability.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4974,6 +4974,8 @@
- ThreadMetricsStruct
GeneralDiagnostics:
- NetworkInterface
ModeSelect:
- SemanticTagStruct
struct fields:
UnitTesting:
SimpleStruct:
Expand Down Expand Up @@ -5068,6 +5070,10 @@
- iPv4Addresses
- iPv6Addresses
- type
ModeSelect:
SemanticTagStruct:
- mfgCode
- value
events:
OTASoftwareUpdateRequestor:
- StateTransition
Expand Down Expand Up @@ -5374,6 +5380,8 @@
- ThreadMetrics
GeneralDiagnostics:
- NetworkInterfaceType
ModeSelect:
- SemanticTag
struct fields:
Descriptor:
DeviceTypeStruct:
Expand Down Expand Up @@ -5521,6 +5529,8 @@
ThreadMetricsStruct: ThreadMetrics
GeneralDiagnostics:
NetworkInterface: NetworkInterfaceType
ModeSelect:
SemanticTagStruct: SemanticTag
struct fields:
Descriptor:
DeviceTypeStruct:
Expand Down
6 changes: 3 additions & 3 deletions src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading