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

Generate all client structs #25847

Merged
merged 2 commits into from
Mar 27, 2023
Merged

Generate all client structs #25847

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
1a1db81
Generate all client side structs
andy31415 Mar 27, 2023
2a5b299
Zap regen
andy31415 Mar 27, 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
12 changes: 6 additions & 6 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,12 @@ client cluster AccessControl = 31 {
kRemoved = 2;
}

struct Target {
nullable cluster_id cluster = 0;
nullable endpoint_no endpoint = 1;
nullable devtype_id deviceType = 2;
}

fabric_scoped struct AccessControlEntryStruct {
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
Expand All @@ -261,12 +267,6 @@ client cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

struct Target {
nullable cluster_id cluster = 0;
nullable endpoint_no endpoint = 1;
nullable devtype_id deviceType = 2;
}

fabric_scoped struct AccessControlExtensionStruct {
fabric_sensitive octet_string<128> data = 1;
fabric_idx fabricIndex = 254;
Expand Down
6 changes: 6 additions & 0 deletions examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,6 +1295,12 @@ client cluster Thermostat = 513 {
kAutoMode = 0x20;
}

struct ThermostatScheduleTransition {
int16u transitionTime = 0;
nullable int16s heatSetpoint = 1;
nullable int16s coolSetpoint = 2;
}

readonly attribute nullable int16s localTemperature = 0;
readonly attribute nullable int16s outdoorTemperature = 1;
readonly attribute bitmap8 occupancy = 2;
Expand Down
12 changes: 6 additions & 6 deletions examples/dynamic-bridge-app/bridge-common/bridge-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,12 @@ client cluster AccessControl = 31 {
kRemoved = 2;
}

struct Target {
nullable cluster_id cluster = 0;
nullable endpoint_no endpoint = 1;
nullable devtype_id deviceType = 2;
}

fabric_scoped struct AccessControlEntryStruct {
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
Expand All @@ -261,12 +267,6 @@ client cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

struct Target {
nullable cluster_id cluster = 0;
nullable endpoint_no endpoint = 1;
nullable devtype_id deviceType = 2;
}

fabric_scoped struct AccessControlExtensionStruct {
fabric_sensitive octet_string<128> data = 1;
fabric_idx fabricIndex = 254;
Expand Down
10 changes: 5 additions & 5 deletions examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,16 +157,16 @@ client cluster Scenes = 5 {
kCopyAllScenes = 0x1;
}

struct ExtensionFieldSet {
cluster_id clusterID = 0;
AttributeValuePair attributeValueList[] = 1;
}

struct AttributeValuePair {
optional attrib_id attributeID = 0;
int8u attributeValue[] = 1;
}

struct ExtensionFieldSet {
cluster_id clusterID = 0;
AttributeValuePair attributeValueList[] = 1;
}

readonly attribute int8u sceneCount = 0;
readonly attribute int8u currentScene = 1;
readonly attribute group_id currentGroup = 2;
Expand Down
12 changes: 6 additions & 6 deletions examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ client cluster AccessControl = 31 {
kRemoved = 2;
}

struct Target {
nullable cluster_id cluster = 0;
nullable endpoint_no endpoint = 1;
nullable devtype_id deviceType = 2;
}

fabric_scoped struct AccessControlEntryStruct {
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
Expand All @@ -53,12 +59,6 @@ client cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

struct Target {
nullable cluster_id cluster = 0;
nullable endpoint_no endpoint = 1;
nullable devtype_id deviceType = 2;
}

fabric_scoped struct AccessControlExtensionStruct {
fabric_sensitive octet_string<128> data = 1;
fabric_idx fabricIndex = 254;
Expand Down
55 changes: 33 additions & 22 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 @@ -1673,6 +1673,12 @@ client cluster OperationalCredentials = 62 {
fabric_idx fabricIndex = 254;
}

fabric_scoped struct NOCStruct {
fabric_sensitive octet_string noc = 1;
nullable fabric_sensitive octet_string icac = 2;
fabric_idx fabricIndex = 254;
}

readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
readonly attribute FabricDescriptorStruct fabrics[] = 1;
readonly attribute int8u supportedFabrics = 2;
Expand Down Expand Up @@ -1843,6 +1849,11 @@ server cluster OperationalCredentials = 62 {
}

client cluster FixedLabel = 64 {
struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down Expand Up @@ -1891,17 +1902,17 @@ client cluster ModeSelect = 80 {
kDeponoff = 0x1;
}

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

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

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

readonly attribute char_string<32> description = 0;
readonly attribute nullable enum16 standardNamespace = 1;
readonly attribute ModeOptionStruct supportedModes[] = 2;
Expand Down Expand Up @@ -2931,8 +2942,15 @@ client cluster ContentLauncher = 1290 {
kHls = 0x2;
}

struct ContentSearchStruct {
ParameterStruct parameterList[] = 0;
struct DimensionStruct {
double width = 0;
double height = 1;
MetricTypeEnum metric = 2;
}

struct AdditionalInfoStruct {
char_string name = 0;
char_string value = 1;
}

struct ParameterStruct {
Expand All @@ -2941,9 +2959,14 @@ client cluster ContentLauncher = 1290 {
optional AdditionalInfoStruct externalIDList[] = 2;
}

struct AdditionalInfoStruct {
char_string name = 0;
char_string value = 1;
struct ContentSearchStruct {
ParameterStruct parameterList[] = 0;
}

struct StyleInformationStruct {
optional char_string imageURL = 0;
optional char_string color = 1;
optional DimensionStruct size = 2;
}

struct BrandingInformationStruct {
Expand All @@ -2955,18 +2978,6 @@ client cluster ContentLauncher = 1290 {
optional StyleInformationStruct waterMark = 5;
}

struct StyleInformationStruct {
optional char_string imageURL = 0;
optional char_string color = 1;
optional DimensionStruct size = 2;
}

struct DimensionStruct {
double width = 0;
double height = 1;
MetricTypeEnum metric = 2;
}

readonly attribute CHAR_STRING acceptHeader[] = 0;
attribute bitmap32 supportedStreamingProtocols = 1;
readonly attribute command_id generatedCommandList[] = 65528;
Expand Down
55 changes: 33 additions & 22 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 @@ -1642,6 +1642,12 @@ client cluster OperationalCredentials = 62 {
fabric_idx fabricIndex = 254;
}

fabric_scoped struct NOCStruct {
fabric_sensitive octet_string noc = 1;
nullable fabric_sensitive octet_string icac = 2;
fabric_idx fabricIndex = 254;
}

readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
readonly attribute FabricDescriptorStruct fabrics[] = 1;
readonly attribute int8u supportedFabrics = 2;
Expand Down Expand Up @@ -1812,6 +1818,11 @@ server cluster OperationalCredentials = 62 {
}

client cluster FixedLabel = 64 {
struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

readonly attribute LabelStruct labelList[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down Expand Up @@ -1860,17 +1871,17 @@ client cluster ModeSelect = 80 {
kDeponoff = 0x1;
}

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

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

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

readonly attribute char_string<32> description = 0;
readonly attribute nullable enum16 standardNamespace = 1;
readonly attribute ModeOptionStruct supportedModes[] = 2;
Expand Down Expand Up @@ -2900,8 +2911,15 @@ client cluster ContentLauncher = 1290 {
kHls = 0x2;
}

struct ContentSearchStruct {
ParameterStruct parameterList[] = 0;
struct DimensionStruct {
double width = 0;
double height = 1;
MetricTypeEnum metric = 2;
}

struct AdditionalInfoStruct {
char_string name = 0;
char_string value = 1;
}

struct ParameterStruct {
Expand All @@ -2910,9 +2928,14 @@ client cluster ContentLauncher = 1290 {
optional AdditionalInfoStruct externalIDList[] = 2;
}

struct AdditionalInfoStruct {
char_string name = 0;
char_string value = 1;
struct ContentSearchStruct {
ParameterStruct parameterList[] = 0;
}

struct StyleInformationStruct {
optional char_string imageURL = 0;
optional char_string color = 1;
optional DimensionStruct size = 2;
}

struct BrandingInformationStruct {
Expand All @@ -2924,18 +2947,6 @@ client cluster ContentLauncher = 1290 {
optional StyleInformationStruct waterMark = 5;
}

struct StyleInformationStruct {
optional char_string imageURL = 0;
optional char_string color = 1;
optional DimensionStruct size = 2;
}

struct DimensionStruct {
double width = 0;
double height = 1;
MetricTypeEnum metric = 2;
}

readonly attribute CHAR_STRING acceptHeader[] = 0;
attribute bitmap32 supportedStreamingProtocols = 1;
readonly attribute command_id generatedCommandList[] = 65528;
Expand Down
30 changes: 15 additions & 15 deletions examples/tv-app/tv-common/tv-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,15 +636,6 @@ client cluster NetworkCommissioning = 49 {
boolean connected = 1;
}

struct WiFiInterfaceScanResult {
WiFiSecurity security = 0;
octet_string<32> ssid = 1;
octet_string<6> bssid = 2;
int16u channel = 3;
WiFiBand wiFiBand = 4;
int8s rssi = 5;
}

struct ThreadInterfaceScanResult {
int16u panId = 0;
int64u extendedPanId = 1;
Expand All @@ -656,6 +647,15 @@ client cluster NetworkCommissioning = 49 {
int8u lqi = 7;
}

struct WiFiInterfaceScanResult {
WiFiSecurity security = 0;
octet_string<32> ssid = 1;
octet_string<6> bssid = 2;
int16u channel = 3;
WiFiBand wiFiBand = 4;
int8s rssi = 5;
}

readonly attribute access(read: administer) int8u maxNetworks = 0;
readonly attribute access(read: administer) NetworkInfo networks[] = 1;
readonly attribute int8u scanMaxTimeSeconds = 2;
Expand Down Expand Up @@ -1366,12 +1366,6 @@ client cluster OperationalCredentials = 62 {
kInvalidFabricIndex = 11;
}

fabric_scoped struct NOCStruct {
fabric_sensitive octet_string noc = 1;
nullable fabric_sensitive octet_string icac = 2;
fabric_idx fabricIndex = 254;
}

fabric_scoped struct FabricDescriptorStruct {
octet_string<65> rootPublicKey = 1;
vendor_id vendorID = 2;
Expand All @@ -1381,6 +1375,12 @@ client cluster OperationalCredentials = 62 {
fabric_idx fabricIndex = 254;
}

fabric_scoped struct NOCStruct {
fabric_sensitive octet_string noc = 1;
nullable fabric_sensitive octet_string icac = 2;
fabric_idx fabricIndex = 254;
}

readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
readonly attribute FabricDescriptorStruct fabrics[] = 1;
readonly attribute int8u supportedFabrics = 2;
Expand Down
Loading