Skip to content

Commit

Permalink
Add size info for attribute string types as well
Browse files Browse the repository at this point in the history
  • Loading branch information
@andy31415
andy31415 committed Jan 21, 2022
1 parent d4289f0 commit 4fd91c6
Show file tree
Hide file tree
Showing 18 changed files with 296 additions and 289 deletions.
66 changes: 33 additions & 33 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,12 @@ server cluster ApplicationBasic = 1293 {
kActiveVisibleNotFocus = 3;
}

readonly attribute char_string vendorName = 0;
readonly attribute char_string<32> vendorName = 0;
readonly attribute int16u vendorId = 1;
readonly attribute char_string applicationName = 2;
readonly attribute char_string<32> applicationName = 2;
readonly attribute int16u productId = 3;
readonly attribute ApplicationStatusEnum applicationStatus = 5;
readonly attribute char_string applicationVersion = 6;
readonly attribute char_string<32> applicationVersion = 6;
readonly attribute vendor_id allowedVendorList[] = 7;
readonly attribute int16u clusterRevision = 65533;
}
Expand Down Expand Up @@ -193,24 +193,24 @@ server cluster Basic = 40 {
}

readonly attribute int16u interactionModelVersion = 0;
readonly attribute char_string vendorName = 1;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string productName = 3;
readonly attribute char_string<32> productName = 3;
readonly attribute int16u productID = 4;
attribute char_string nodeLabel = 5;
attribute char_string location = 6;
attribute char_string<32> nodeLabel = 5;
attribute char_string<2> location = 6;
readonly attribute int16u hardwareVersion = 7;
readonly attribute char_string hardwareVersionString = 8;
readonly attribute char_string<64> hardwareVersionString = 8;
readonly attribute int32u softwareVersion = 9;
readonly attribute char_string softwareVersionString = 10;
readonly attribute char_string manufacturingDate = 11;
readonly attribute char_string partNumber = 12;
readonly attribute long_char_string productURL = 13;
readonly attribute char_string productLabel = 14;
readonly attribute char_string serialNumber = 15;
readonly attribute char_string<64> softwareVersionString = 10;
readonly attribute char_string<16> manufacturingDate = 11;
readonly attribute char_string<32> partNumber = 12;
readonly attribute long_char_string<256> productURL = 13;
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute boolean localConfigDisabled = 16;
readonly attribute boolean reachable = 17;
readonly attribute char_string uniqueID = 18;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute int16u clusterRevision = 65533;

command MfgSpecificPing(): DefaultSuccess = 0;
Expand Down Expand Up @@ -313,7 +313,7 @@ server cluster BridgedActions = 37 {

readonly attribute ActionStruct actionList[] = 0;
readonly attribute EndpointListStruct endpointList[] = 1;
readonly attribute long_char_string setupUrl = 2;
readonly attribute long_char_string<512> setupUrl = 2;
readonly attribute int16u clusterRevision = 65533;
}

Expand Down Expand Up @@ -396,7 +396,7 @@ server cluster ColorControl = 768 {
readonly attribute int16u currentX = 3;
readonly attribute int16u currentY = 4;
readonly attribute enum8 driftCompensation = 5;
readonly attribute char_string compensationText = 6;
readonly attribute char_string<254> compensationText = 6;
readonly attribute int16u colorTemperature = 7;
readonly attribute enum8 colorMode = 8;
attribute bitmap8 colorControlOptions = 15;
Expand Down Expand Up @@ -976,7 +976,7 @@ server cluster DoorLock = 257 {
readonly attribute int8u maxPINCodeLength = 23;
readonly attribute int8u minPINCodeLength = 24;
readonly attribute bitmap8 credentialRulesSupport = 27;
attribute char_string language = 33;
attribute char_string<3> language = 33;
attribute int32u autoRelockTime = 35;
attribute int8u soundVolume = 36;
attribute DlOperatingMode operatingMode = 37;
Expand Down Expand Up @@ -1687,7 +1687,7 @@ server cluster LevelControl = 8 {
}

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

Expand Down Expand Up @@ -1762,7 +1762,7 @@ server cluster ModeSelect = 80 {
readonly attribute ModeOptionStruct supportedModes[] = 1;
attribute int8u onMode = 2;
readonly attribute int8u startUpMode = 3;
readonly attribute char_string description = 4;
readonly attribute char_string<32> description = 4;
readonly attribute int16u clusterRevision = 65533;

request struct ChangeToModeRequest {
Expand Down Expand Up @@ -1828,7 +1828,7 @@ server cluster NetworkCommissioning = 49 {
readonly attribute int8u connectMaxTimeSeconds = 3;
attribute boolean interfaceEnabled = 4;
readonly attribute NetworkCommissioningStatus lastNetworkingStatus = 5;
readonly attribute octet_string lastNetworkID = 6;
readonly attribute octet_string<32> lastNetworkID = 6;
readonly attribute int32u lastConnectErrorValue = 7;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down Expand Up @@ -2182,7 +2182,7 @@ server cluster OperationalCredentials = 62 {
server cluster PowerSource = 47 {
readonly attribute enum8 status = 0;
readonly attribute int8u order = 1;
readonly attribute char_string description = 2;
readonly attribute char_string<60> description = 2;
readonly attribute int32u batteryVoltage = 11;
readonly attribute int8u batteryPercentRemaining = 12;
readonly attribute int32u batteryTimeRemaining = 13;
Expand Down Expand Up @@ -2584,13 +2584,13 @@ server cluster TestCluster = 1295 {
attribute enum16 enum16 = 22;
attribute single floatSingle = 23;
attribute double floatDouble = 24;
attribute octet_string octetString = 25;
attribute octet_string<10> octetString = 25;
attribute INT8U listInt8u[] = 26;
attribute OCTET_STRING listOctetString[] = 27;
attribute TestListStructOctet listStructOctetString[] = 28;
attribute long_octet_string longOctetString = 29;
attribute char_string charString = 30;
attribute long_char_string longCharString = 31;
attribute long_octet_string<1000> longOctetString = 29;
attribute char_string<10> charString = 30;
attribute long_char_string<1000> longCharString = 31;
attribute epoch_us epochUs = 32;
attribute epoch_s epochS = 33;
attribute vendor_id vendorId = 34;
Expand Down Expand Up @@ -2628,8 +2628,8 @@ server cluster TestCluster = 1295 {
attribute enum16 nullableEnum16 = 32790;
attribute single nullableFloatSingle = 32791;
attribute double nullableFloatDouble = 32792;
attribute octet_string nullableOctetString = 32793;
attribute char_string nullableCharString = 32798;
attribute octet_string<10> nullableOctetString = 32793;
attribute char_string<10> nullableCharString = 32798;
attribute SimpleEnum nullableEnumAttr = 32804;
attribute SimpleStruct nullableStruct = 32805;
attribute int8u nullableRangeRestrictedInt8u = 32806;
Expand Down Expand Up @@ -2859,10 +2859,10 @@ server cluster ThreadNetworkDiagnostics = 53 {

readonly attribute int16u channel = 0;
readonly attribute enum8 routingRole = 1;
readonly attribute octet_string networkName = 2;
readonly attribute octet_string<16> networkName = 2;
readonly attribute int16u panId = 3;
readonly attribute int64u extendedPanId = 4;
readonly attribute octet_string meshLocalPrefix = 5;
readonly attribute octet_string<17> meshLocalPrefix = 5;
readonly attribute int64u overrunCount = 6;
readonly attribute NeighborTable neighborTableList[] = 7;
readonly attribute RouteTable routeTableList[] = 8;
Expand Down Expand Up @@ -2917,7 +2917,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute int64u pendingTimestamp = 57;
readonly attribute int32u delay = 58;
readonly attribute SecurityPolicy securityPolicy[] = 59;
readonly attribute octet_string channelMask = 60;
readonly attribute octet_string<4> channelMask = 60;
readonly attribute OperationalDatasetComponents operationalDatasetComponents[] = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
Expand All @@ -2932,7 +2932,7 @@ server cluster UserLabel = 65 {
}

server cluster WakeOnLan = 1283 {
readonly attribute char_string wakeOnLanMacAddress = 0;
readonly attribute char_string<32> wakeOnLanMacAddress = 0;
readonly attribute int16u clusterRevision = 65533;
}

Expand Down Expand Up @@ -2980,7 +2980,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
WiFiConnectionStatus connectionStatus = 0;
}

readonly attribute octet_string bssid = 0;
readonly attribute octet_string<6> bssid = 0;
readonly attribute enum8 securityType = 1;
readonly attribute enum8 wiFiVersion = 2;
readonly attribute int16u channelNumber = 3;
Expand Down
24 changes: 12 additions & 12 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,16 @@ server cluster Basic = 40 {
}

readonly attribute int16u interactionModelVersion = 0;
readonly attribute char_string vendorName = 1;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string productName = 3;
readonly attribute char_string<32> productName = 3;
readonly attribute int16u productID = 4;
attribute char_string nodeLabel = 5;
attribute char_string location = 6;
attribute char_string<32> nodeLabel = 5;
attribute char_string<2> location = 6;
readonly attribute int16u hardwareVersion = 7;
readonly attribute char_string hardwareVersionString = 8;
readonly attribute char_string<64> hardwareVersionString = 8;
readonly attribute int32u softwareVersion = 9;
readonly attribute char_string softwareVersionString = 10;
readonly attribute char_string<64> softwareVersionString = 10;
readonly attribute int16u clusterRevision = 65533;
}

Expand Down Expand Up @@ -375,7 +375,7 @@ server cluster LevelControl = 8 {
}

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

Expand Down Expand Up @@ -435,7 +435,7 @@ server cluster NetworkCommissioning = 49 {
readonly attribute int8u connectMaxTimeSeconds = 3;
attribute boolean interfaceEnabled = 4;
readonly attribute NetworkCommissioningStatus lastNetworkingStatus = 5;
readonly attribute octet_string lastNetworkID = 6;
readonly attribute octet_string<32> lastNetworkID = 6;
readonly attribute int32u lastConnectErrorValue = 7;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down Expand Up @@ -769,10 +769,10 @@ server cluster ThreadNetworkDiagnostics = 53 {

readonly attribute int16u channel = 0;
readonly attribute enum8 routingRole = 1;
readonly attribute octet_string networkName = 2;
readonly attribute octet_string<16> networkName = 2;
readonly attribute int16u panId = 3;
readonly attribute int64u extendedPanId = 4;
readonly attribute octet_string meshLocalPrefix = 5;
readonly attribute octet_string<17> meshLocalPrefix = 5;
readonly attribute int64u overrunCount = 6;
readonly attribute NeighborTable neighborTableList[] = 7;
readonly attribute RouteTable routeTableList[] = 8;
Expand Down Expand Up @@ -827,7 +827,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute int64u pendingTimestamp = 57;
readonly attribute int32u delay = 58;
readonly attribute SecurityPolicy securityPolicy[] = 59;
readonly attribute octet_string channelMask = 60;
readonly attribute octet_string<4> channelMask = 60;
readonly attribute OperationalDatasetComponents operationalDatasetComponents[] = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
Expand Down Expand Up @@ -883,7 +883,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
WiFiConnectionStatus connectionStatus = 0;
}

readonly attribute octet_string bssid = 0;
readonly attribute octet_string<6> bssid = 0;
readonly attribute enum8 securityType = 1;
readonly attribute enum8 wiFiVersion = 2;
readonly attribute int16u channelNumber = 3;
Expand Down
30 changes: 15 additions & 15 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 @@ -58,16 +58,16 @@ server cluster Basic = 40 {
}

readonly attribute int16u interactionModelVersion = 0;
readonly attribute char_string vendorName = 1;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string productName = 3;
readonly attribute char_string<32> productName = 3;
readonly attribute int16u productID = 4;
attribute char_string nodeLabel = 5;
attribute char_string location = 6;
attribute char_string<32> nodeLabel = 5;
attribute char_string<2> location = 6;
readonly attribute int16u hardwareVersion = 7;
readonly attribute char_string hardwareVersionString = 8;
readonly attribute char_string<64> hardwareVersionString = 8;
readonly attribute int32u softwareVersion = 9;
readonly attribute char_string softwareVersionString = 10;
readonly attribute char_string<64> softwareVersionString = 10;
readonly attribute int16u clusterRevision = 65533;
}

Expand Down Expand Up @@ -359,7 +359,7 @@ server cluster DoorLock = 257 {
readonly attribute int8u maxPINCodeLength = 23;
readonly attribute int8u minPINCodeLength = 24;
readonly attribute bitmap8 credentialRulesSupport = 27;
attribute char_string language = 33;
attribute char_string<3> language = 33;
attribute int32u autoRelockTime = 35;
attribute int8u soundVolume = 36;
attribute DlOperatingMode operatingMode = 37;
Expand Down Expand Up @@ -627,7 +627,7 @@ server cluster GeneralDiagnostics = 51 {
}

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

Expand Down Expand Up @@ -687,7 +687,7 @@ server cluster NetworkCommissioning = 49 {
readonly attribute int8u connectMaxTimeSeconds = 3;
attribute boolean interfaceEnabled = 4;
readonly attribute NetworkCommissioningStatus lastNetworkingStatus = 5;
readonly attribute octet_string lastNetworkID = 6;
readonly attribute octet_string<32> lastNetworkID = 6;
readonly attribute int32u lastConnectErrorValue = 7;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down Expand Up @@ -862,12 +862,12 @@ server cluster OperationalCredentials = 62 {
server cluster PowerSource = 47 {
readonly attribute enum8 status = 0;
readonly attribute int8u order = 1;
readonly attribute char_string description = 2;
readonly attribute char_string<60> description = 2;
readonly attribute int32u wiredAssessedCurrent = 6;
readonly attribute enum8 batteryChargeLevel = 14;
readonly attribute boolean batteryReplacementNeeded = 15;
readonly attribute enum8 batteryReplaceability = 16;
readonly attribute char_string batteryReplacementDescription = 19;
readonly attribute char_string<60> batteryReplacementDescription = 19;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
}
Expand Down Expand Up @@ -977,10 +977,10 @@ server cluster ThreadNetworkDiagnostics = 53 {

readonly attribute int16u channel = 0;
readonly attribute enum8 routingRole = 1;
readonly attribute octet_string networkName = 2;
readonly attribute octet_string<16> networkName = 2;
readonly attribute int16u panId = 3;
readonly attribute int64u extendedPanId = 4;
readonly attribute octet_string meshLocalPrefix = 5;
readonly attribute octet_string<17> meshLocalPrefix = 5;
readonly attribute int64u overrunCount = 6;
readonly attribute NeighborTable neighborTableList[] = 7;
readonly attribute RouteTable routeTableList[] = 8;
Expand Down Expand Up @@ -1035,7 +1035,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute int64u pendingTimestamp = 57;
readonly attribute int32u delay = 58;
readonly attribute SecurityPolicy securityPolicy[] = 59;
readonly attribute octet_string channelMask = 60;
readonly attribute octet_string<4> channelMask = 60;
readonly attribute OperationalDatasetComponents operationalDatasetComponents[] = 61;
readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
readonly attribute bitmap32 featureMap = 65532;
Expand Down Expand Up @@ -1091,7 +1091,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
WiFiConnectionStatus connectionStatus = 0;
}

readonly attribute octet_string bssid = 0;
readonly attribute octet_string<6> bssid = 0;
readonly attribute enum8 securityType = 1;
readonly attribute enum8 wiFiVersion = 2;
readonly attribute int16u channelNumber = 3;
Expand Down
Loading

0 comments on commit 4fd91c6

Please sign in to comment.