Skip to content

Commit

Permalink
Remove global keyword from matter IDL files (#17139)
Browse files Browse the repository at this point in the history 
* Remove global IDL configuration from IDL parser - it has no meaning

* Remove global from IDL autogeneration

* Remove one more global attribute from IDL parsing

* Regenerated zap
  • Loading branch information
@andy31415 @pull
andy31415 authored and pull[bot] committed Jan 25, 2024
1 parent 3687a09 commit 3368410
Show file tree
Hide file tree
Showing 24 changed files with 1,064 additions and 1,081 deletions.
168 changes: 84 additions & 84 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ client cluster AccessControl = 31 {

attribute AccessControlEntry acl[] = 0;
attribute ExtensionEntry extension[] = 1;
readonly global attribute attrib_id attributeList[] = 65531;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute int16u clusterRevision = 65533;
}

server cluster AccessControl = 31 {
Expand Down Expand Up @@ -126,8 +126,8 @@ server cluster AccessControl = 31 {

attribute AccessControlEntry acl[] = 0;
attribute ExtensionEntry extension[] = 1;
readonly global attribute attrib_id attributeList[] = 65531;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute int16u clusterRevision = 65533;
}

server cluster AdministratorCommissioning = 60 {
Expand All @@ -146,7 +146,7 @@ server cluster AdministratorCommissioning = 60 {
readonly attribute int8u windowStatus = 0;
readonly attribute fabric_idx adminFabricIndex = 1;
readonly attribute int16u adminVendorId = 2;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute int16u clusterRevision = 65533;

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
Expand Down Expand Up @@ -199,7 +199,7 @@ server cluster Basic = 40 {
attribute boolean localConfigDisabled = 16;
readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute int16u clusterRevision = 65533;
}

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

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

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

server cluster GeneralCommissioning = 48 {
Expand All @@ -301,8 +301,8 @@ server cluster GeneralCommissioning = 48 {
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
readonly attribute RegulatoryLocationType locationCapability = 3;
readonly attribute boolean supportsConcurrentConnection = 4;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

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

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

request struct MoveToLevelRequest {
INT8U level = 0;
Expand Down Expand Up @@ -516,7 +516,7 @@ server cluster LevelControl = 8 {
server cluster LocalizationConfiguration = 43 {
attribute char_string<35> activeLocale = 1;
readonly attribute CHAR_STRING supportedLocales[] = 2;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute int16u clusterRevision = 65533;
}

server cluster NetworkCommissioning = 49 {
Expand Down Expand Up @@ -591,8 +591,8 @@ server cluster NetworkCommissioning = 49 {
readonly attribute nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
readonly attribute nullable octet_string<32> lastNetworkID = 6;
readonly attribute nullable int32s lastConnectErrorValue = 7;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

request struct ScanNetworksRequest {
optional nullable OCTET_STRING ssid = 0;
Expand Down Expand Up @@ -684,7 +684,7 @@ server cluster OnOff = 6 {
}

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

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

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

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

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

server cluster TimeFormatLocalization = 44 {
Expand All @@ -1034,7 +1034,7 @@ server cluster TimeFormatLocalization = 44 {
attribute HourFormat hourFormat = 0;
attribute CalendarType activeCalendarType = 1;
readonly attribute CalendarType supportedCalendarTypes[] = 2;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute int16u clusterRevision = 65533;
}

server cluster UnitLocalization = 45 {
Expand All @@ -1049,13 +1049,13 @@ server cluster UnitLocalization = 45 {
}

attribute TempUnit temperatureUnit = 0;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
}

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

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


Expand Down
56 changes: 28 additions & 28 deletions examples/door-lock-app/door-lock-common/door-lock-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ server cluster AccessControl = 31 {

attribute AccessControlEntry acl[] = 0;
attribute ExtensionEntry extension[] = 1;
readonly global attribute attrib_id attributeList[] = 65531;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute int16u clusterRevision = 65533;
}

server cluster AdministratorCommissioning = 60 {
Expand All @@ -84,7 +84,7 @@ server cluster AdministratorCommissioning = 60 {
readonly attribute int8u windowStatus = 0;
readonly attribute fabric_idx adminFabricIndex = 1;
readonly attribute int16u adminVendorId = 2;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute int16u clusterRevision = 65533;

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
Expand Down Expand Up @@ -137,7 +137,7 @@ server cluster Basic = 40 {
attribute boolean localConfigDisabled = 16;
readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute int16u clusterRevision = 65533;
}

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

server cluster DiagnosticLogs = 50 {
Expand Down Expand Up @@ -586,8 +586,8 @@ server cluster DoorLock = 257 {
attribute int8u wrongCodeEntryLimit = 48;
attribute int8u userCodeTemporaryDisableTime = 49;
attribute boolean requirePINforRemoteOperation = 51;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

request struct LockDoorRequest {
optional OCTET_STRING pinCode = 0;
Expand Down Expand Up @@ -752,13 +752,13 @@ server cluster EthernetNetworkDiagnostics = 55 {
readonly attribute int64u overrunCount = 6;
readonly attribute nullable boolean carrierDetect = 7;
readonly attribute int64u timeSinceReset = 8;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
}

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

server cluster GeneralCommissioning = 48 {
Expand All @@ -785,8 +785,8 @@ server cluster GeneralCommissioning = 48 {
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
readonly attribute RegulatoryLocationType locationCapability = 3;
readonly attribute boolean supportsConcurrentConnection = 4;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

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

server cluster LocalizationConfiguration = 43 {
attribute char_string<35> activeLocale = 1;
readonly attribute CHAR_STRING supportedLocales[] = 2;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute int16u clusterRevision = 65533;
}

server cluster NetworkCommissioning = 49 {
Expand Down Expand Up @@ -988,8 +988,8 @@ server cluster NetworkCommissioning = 49 {
readonly attribute nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
readonly attribute nullable octet_string<32> lastNetworkID = 6;
readonly attribute nullable int32s lastConnectErrorValue = 7;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

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

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

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

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

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

server cluster TimeFormatLocalization = 44 {
Expand All @@ -1438,12 +1438,12 @@ server cluster TimeFormatLocalization = 44 {
attribute HourFormat hourFormat = 0;
attribute CalendarType activeCalendarType = 1;
readonly attribute CalendarType supportedCalendarTypes[] = 2;
readonly global attribute int16u clusterRevision = 65533;
readonly attribute int16u clusterRevision = 65533;
}

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

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


Expand Down
Loading

0 comments on commit 3368410

Please sign in to comment.