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

[IDL] add 'global' property for attributes #13791

Merged
merged 1 commit into from
Jan 20, 2022
Merged

[IDL] add 'global' property for attributes #13791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
146 changes: 73 additions & 73 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop

Large diffs are not rendered by default.

48 changes: 24 additions & 24 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 @@ -22,7 +22,7 @@ server cluster AdministratorCommissioning = 60 {
readonly attribute int8u windowStatus = 0;
readonly attribute fabric_idx adminFabricIndex = 1;
readonly attribute int16u adminVendorId = 2;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute int16u clusterRevision = 65533;

request struct OpenBasicCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
Expand Down Expand Up @@ -68,7 +68,7 @@ server cluster Basic = 40 {
readonly attribute char_string hardwareVersionString = 8;
readonly attribute int32u softwareVersion = 9;
readonly attribute char_string softwareVersionString = 10;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster Descriptor = 29 {
Expand All @@ -81,7 +81,7 @@ server cluster Descriptor = 29 {
readonly attribute CLUSTER_ID serverList[] = 1;
readonly attribute CLUSTER_ID clientList[] = 2;
readonly attribute ENDPOINT_NO partsList[] = 3;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster DiagnosticLogs = 50 {
Expand Down Expand Up @@ -137,13 +137,13 @@ server cluster EthernetNetworkDiagnostics = 55 {
readonly attribute int64u overrunCount = 6;
readonly attribute boolean carrierDetect = 7;
readonly attribute int64u timeSinceReset = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster FixedLabel = 64 {
readonly attribute LabelStruct labelList[] = 0;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster GeneralCommissioning = 48 {
Expand All @@ -168,8 +168,8 @@ server cluster GeneralCommissioning = 48 {
readonly attribute BasicCommissioningInfoType basicCommissioningInfoList[] = 1;
readonly attribute enum8 regulatoryConfig = 2;
readonly attribute enum8 locationCapability = 3;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;

request struct ArmFailSafeRequest {
INT16U expiryLengthSeconds = 0;
Expand Down Expand Up @@ -290,7 +290,7 @@ server cluster GeneralDiagnostics = 51 {
readonly attribute ENUM8 activeHardwareFaults[] = 5;
readonly attribute ENUM8 activeRadioFaults[] = 6;
readonly attribute ENUM8 activeNetworkFaults[] = 7;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster LevelControl = 8 {
Expand Down Expand Up @@ -318,8 +318,8 @@ server cluster LevelControl = 8 {
attribute int16u offTransitionTime = 19;
attribute int8u defaultMoveRate = 20;
attribute int8u startUpCurrentLevel = 16384;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;

request struct MoveRequest {
MoveMode moveMode = 0;
Expand Down Expand Up @@ -437,8 +437,8 @@ server cluster NetworkCommissioning = 49 {
readonly attribute NetworkCommissioningStatus lastNetworkingStatus = 5;
readonly attribute octet_string lastNetworkID = 6;
readonly attribute int32u lastConnectErrorValue = 7;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;

request struct AddOrUpdateThreadNetworkRequest {
OCTET_STRING operationalDataset = 0;
Expand Down Expand Up @@ -515,7 +515,7 @@ server cluster OnOff = 6 {
}

readonly attribute boolean onOff = 0;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute int16u clusterRevision = 65533;

command Off(): DefaultSuccess = 0;
command On(): DefaultSuccess = 1;
Expand Down Expand Up @@ -557,7 +557,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute int16u clusterRevision = 65533;

request struct AddNOCRequest {
OCTET_STRING NOCValue = 0;
Expand Down Expand Up @@ -648,8 +648,8 @@ server cluster SoftwareDiagnostics = 52 {
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster Switch = 59 {
Expand Down Expand Up @@ -686,8 +686,8 @@ server cluster Switch = 59 {
readonly attribute int8u numberOfPositions = 0;
readonly attribute int8u currentPosition = 1;
readonly attribute int8u multiPressMax = 2;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster ThreadNetworkDiagnostics = 53 {
Expand Down Expand Up @@ -830,13 +830,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute octet_string channelMask = 60;
readonly attribute OperationalDatasetComponents operationalDatasetComponents[] = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster UserLabel = 65 {
attribute LabelStruct labelList[] = 0;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster WiFiNetworkDiagnostics = 54 {
Expand Down Expand Up @@ -896,8 +896,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
readonly attribute int32u packetUnicastTxCount = 10;
readonly attribute int64u currentMaxRate = 11;
readonly attribute int64u overrunCount = 12;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
}


Expand Down
46 changes: 23 additions & 23 deletions examples/door-lock-app/door-lock-common/door-lock-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ server cluster AdministratorCommissioning = 60 {
readonly attribute int8u windowStatus = 0;
readonly attribute fabric_idx adminFabricIndex = 1;
readonly attribute int16u adminVendorId = 2;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute int16u clusterRevision = 65533;

request struct OpenBasicCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
Expand Down Expand Up @@ -68,7 +68,7 @@ server cluster Basic = 40 {
readonly attribute char_string hardwareVersionString = 8;
readonly attribute int32u softwareVersion = 9;
readonly attribute char_string softwareVersionString = 10;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster Descriptor = 29 {
Expand All @@ -81,7 +81,7 @@ server cluster Descriptor = 29 {
readonly attribute CLUSTER_ID serverList[] = 1;
readonly attribute CLUSTER_ID clientList[] = 2;
readonly attribute ENDPOINT_NO partsList[] = 3;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster DiagnosticLogs = 50 {
Expand Down Expand Up @@ -368,7 +368,7 @@ server cluster DoorLock = 257 {
attribute boolean enablePrivacyModeButton = 43;
attribute int8u wrongCodeEntryLimit = 48;
attribute int8u userCodeTemporaryDisableTime = 49;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute int16u clusterRevision = 65533;

request struct ClearCredentialRequest {
DlCredential credential = 0;
Expand Down Expand Up @@ -470,13 +470,13 @@ server cluster EthernetNetworkDiagnostics = 55 {
readonly attribute int64u overrunCount = 6;
readonly attribute boolean carrierDetect = 7;
readonly attribute int64u timeSinceReset = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster FixedLabel = 64 {
readonly attribute LabelStruct labelList[] = 0;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster GeneralCommissioning = 48 {
Expand All @@ -501,8 +501,8 @@ server cluster GeneralCommissioning = 48 {
readonly attribute BasicCommissioningInfoType basicCommissioningInfoList[] = 1;
readonly attribute enum8 regulatoryConfig = 2;
readonly attribute enum8 locationCapability = 3;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;

request struct ArmFailSafeRequest {
INT16U expiryLengthSeconds = 0;
Expand Down Expand Up @@ -623,7 +623,7 @@ server cluster GeneralDiagnostics = 51 {
readonly attribute ENUM8 activeHardwareFaults[] = 5;
readonly attribute ENUM8 activeRadioFaults[] = 6;
readonly attribute ENUM8 activeNetworkFaults[] = 7;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster LocalizationConfiguration = 43 {
Expand Down Expand Up @@ -689,8 +689,8 @@ server cluster NetworkCommissioning = 49 {
readonly attribute NetworkCommissioningStatus lastNetworkingStatus = 5;
readonly attribute octet_string lastNetworkID = 6;
readonly attribute int32u lastConnectErrorValue = 7;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;

request struct AddOrUpdateThreadNetworkRequest {
OCTET_STRING operationalDataset = 0;
Expand Down Expand Up @@ -785,7 +785,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute int16u clusterRevision = 65533;

request struct AddNOCRequest {
OCTET_STRING NOCValue = 0;
Expand Down Expand Up @@ -868,13 +868,13 @@ server cluster PowerSource = 47 {
readonly attribute boolean batteryReplacementNeeded = 15;
readonly attribute enum8 batteryReplaceability = 16;
readonly attribute char_string batteryReplacementDescription = 19;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster PowerSourceConfiguration = 46 {
readonly attribute INT8U sources[] = 0;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster SoftwareDiagnostics = 52 {
Expand All @@ -894,8 +894,8 @@ server cluster SoftwareDiagnostics = 52 {
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster ThreadNetworkDiagnostics = 53 {
Expand Down Expand Up @@ -1038,13 +1038,13 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute octet_string channelMask = 60;
readonly attribute OperationalDatasetComponents operationalDatasetComponents[] = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster UserLabel = 65 {
attribute LabelStruct labelList[] = 0;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute int16u clusterRevision = 65533;
}

server cluster WiFiNetworkDiagnostics = 54 {
Expand Down Expand Up @@ -1104,8 +1104,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
readonly attribute int32u packetUnicastTxCount = 10;
readonly attribute int64u currentMaxRate = 11;
readonly attribute int64u overrunCount = 12;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
}


Expand Down
Loading