Skip to content

Commit

Permalink
Merge branch 'master' into FEATURE_TI_Sysconfig_1_16_2_Update
Browse files Browse the repository at this point in the history
  • Loading branch information
adabreuti authored Oct 27, 2023
2 parents 93efd27 + 851b001 commit e51faad
Show file tree
Hide file tree
Showing 102 changed files with 1,467 additions and 755 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -836,22 +836,22 @@ server cluster OperationalCredentials = 62 {
readonly attribute int16u clusterRevision = 65533;

request struct AttestationRequestRequest {
octet_string attestationNonce = 0;
octet_string<32> attestationNonce = 0;
}

request struct CertificateChainRequestRequest {
CertificateChainTypeEnum certificateType = 0;
}

request struct CSRRequestRequest {
octet_string CSRNonce = 0;
octet_string<32> CSRNonce = 0;
optional boolean isForUpdateNOC = 1;
}

request struct AddNOCRequest {
octet_string NOCValue = 0;
optional octet_string ICACValue = 1;
octet_string IPKValue = 2;
octet_string<400> NOCValue = 0;
optional octet_string<400> ICACValue = 1;
octet_string<16> IPKValue = 2;
int64u caseAdminSubject = 3;
vendor_id adminVendorId = 4;
}
Expand All @@ -874,12 +874,12 @@ server cluster OperationalCredentials = 62 {
}

response struct AttestationResponse = 1 {
octet_string attestationElements = 0;
octet_string attestationSignature = 1;
octet_string<900> attestationElements = 0;
octet_string<64> attestationSignature = 1;
}

response struct CertificateChainResponse = 3 {
octet_string certificate = 0;
octet_string<600> certificate = 0;
}

response struct CSRResponse = 5 {
Expand All @@ -890,7 +890,7 @@ server cluster OperationalCredentials = 62 {
response struct NOCResponse = 8 {
NodeOperationalCertStatusEnum statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional char_string debugText = 2;
optional char_string<128> debugText = 2;
}

command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

command ResetCounts(): DefaultSuccess = 0;
command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
}

/** Commands to trigger a Node to allow a new Administrator to commission it. */
Expand Down Expand Up @@ -1103,22 +1103,22 @@ server cluster OperationalCredentials = 62 {
readonly attribute int16u clusterRevision = 65533;

request struct AttestationRequestRequest {
octet_string attestationNonce = 0;
octet_string<32> attestationNonce = 0;
}

request struct CertificateChainRequestRequest {
CertificateChainTypeEnum certificateType = 0;
}

request struct CSRRequestRequest {
octet_string CSRNonce = 0;
octet_string<32> CSRNonce = 0;
optional boolean isForUpdateNOC = 1;
}

request struct AddNOCRequest {
octet_string NOCValue = 0;
optional octet_string ICACValue = 1;
octet_string IPKValue = 2;
octet_string<400> NOCValue = 0;
optional octet_string<400> ICACValue = 1;
octet_string<16> IPKValue = 2;
int64u caseAdminSubject = 3;
vendor_id adminVendorId = 4;
}
Expand All @@ -1141,12 +1141,12 @@ server cluster OperationalCredentials = 62 {
}

response struct AttestationResponse = 1 {
octet_string attestationElements = 0;
octet_string attestationSignature = 1;
octet_string<900> attestationElements = 0;
octet_string<64> attestationSignature = 1;
}

response struct CertificateChainResponse = 3 {
octet_string certificate = 0;
octet_string<600> certificate = 0;
}

response struct CSRResponse = 5 {
Expand All @@ -1157,7 +1157,7 @@ server cluster OperationalCredentials = 62 {
response struct NOCResponse = 8 {
NodeOperationalCertStatusEnum statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional char_string debugText = 2;
optional char_string<128> debugText = 2;
}

command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1979,7 +1979,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

command ResetCounts(): DefaultSuccess = 0;
command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
}

/** Accurate time is required for a number of reasons, including scheduling, display and validating security materials. */
Expand Down Expand Up @@ -2268,22 +2268,22 @@ server cluster OperationalCredentials = 62 {
readonly attribute int16u clusterRevision = 65533;

request struct AttestationRequestRequest {
octet_string attestationNonce = 0;
octet_string<32> attestationNonce = 0;
}

request struct CertificateChainRequestRequest {
CertificateChainTypeEnum certificateType = 0;
}

request struct CSRRequestRequest {
octet_string CSRNonce = 0;
octet_string<32> CSRNonce = 0;
optional boolean isForUpdateNOC = 1;
}

request struct AddNOCRequest {
octet_string NOCValue = 0;
optional octet_string ICACValue = 1;
octet_string IPKValue = 2;
octet_string<400> NOCValue = 0;
optional octet_string<400> ICACValue = 1;
octet_string<16> IPKValue = 2;
int64u caseAdminSubject = 3;
vendor_id adminVendorId = 4;
}
Expand All @@ -2306,12 +2306,12 @@ server cluster OperationalCredentials = 62 {
}

response struct AttestationResponse = 1 {
octet_string attestationElements = 0;
octet_string attestationSignature = 1;
octet_string<900> attestationElements = 0;
octet_string<64> attestationSignature = 1;
}

response struct CertificateChainResponse = 3 {
octet_string certificate = 0;
octet_string<600> certificate = 0;
}

response struct CSRResponse = 5 {
Expand All @@ -2322,7 +2322,7 @@ server cluster OperationalCredentials = 62 {
response struct NOCResponse = 8 {
NodeOperationalCertStatusEnum statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional char_string debugText = 2;
optional char_string<128> debugText = 2;
}

command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
Expand Down Expand Up @@ -2463,6 +2463,26 @@ server cluster IcdManagement = 70 {
kLongIdleTimeSupport = 0x4;
}

bitmap UserActiveModeTriggerBitmap : bitmap32 {
kPowerCycle = 0x1;
kSettingsMenu = 0x2;
kCustomInstruction = 0x4;
kDeviceManual = 0x8;
kActuateSensor = 0x10;
kActuateSensorSeconds = 0x20;
kActuateSensorTimes = 0x40;
kActuateSensorLightsBlink = 0x80;
kResetButton = 0x100;
kResetButtonLightsBlink = 0x200;
kResetButtonSeconds = 0x400;
kResetButtonTimes = 0x800;
kSetupButton = 0x1000;
kSetupButtonSeconds = 0x2000;
kSetupButtonLightsBlink = 0x4000;
kSetupButtonTimes = 0x8000;
kAppDefinedButton = 0x10000;
}

fabric_scoped struct MonitoringRegistrationStruct {
fabric_sensitive node_id checkInNodeID = 1;
fabric_sensitive int64u monitoredSubject = 2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1734,7 +1734,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

command ResetCounts(): DefaultSuccess = 0;
command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
}

/** This cluster exposes interactions with a switch device, for the purpose of using those interactions by other devices.
Expand Down Expand Up @@ -1878,22 +1878,22 @@ server cluster OperationalCredentials = 62 {
readonly attribute int16u clusterRevision = 65533;

request struct AttestationRequestRequest {
octet_string attestationNonce = 0;
octet_string<32> attestationNonce = 0;
}

request struct CertificateChainRequestRequest {
CertificateChainTypeEnum certificateType = 0;
}

request struct CSRRequestRequest {
octet_string CSRNonce = 0;
octet_string<32> CSRNonce = 0;
optional boolean isForUpdateNOC = 1;
}

request struct AddNOCRequest {
octet_string NOCValue = 0;
optional octet_string ICACValue = 1;
octet_string IPKValue = 2;
octet_string<400> NOCValue = 0;
optional octet_string<400> ICACValue = 1;
octet_string<16> IPKValue = 2;
int64u caseAdminSubject = 3;
vendor_id adminVendorId = 4;
}
Expand All @@ -1916,12 +1916,12 @@ server cluster OperationalCredentials = 62 {
}

response struct AttestationResponse = 1 {
octet_string attestationElements = 0;
octet_string attestationSignature = 1;
octet_string<900> attestationElements = 0;
octet_string<64> attestationSignature = 1;
}

response struct CertificateChainResponse = 3 {
octet_string certificate = 0;
octet_string<600> certificate = 0;
}

response struct CSRResponse = 5 {
Expand All @@ -1932,7 +1932,7 @@ server cluster OperationalCredentials = 62 {
response struct NOCResponse = 8 {
NodeOperationalCertStatusEnum statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional char_string debugText = 2;
optional char_string<128> debugText = 2;
}

command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
Expand Down Expand Up @@ -3283,8 +3283,8 @@ server cluster MediaInput = 1287 {
struct InputInfoStruct {
int8u index = 0;
InputTypeEnum inputType = 1;
char_string<32> name = 2;
char_string<32> description = 3;
char_string name = 2;
char_string description = 3;
}

readonly attribute InputInfoStruct inputList[] = 0;
Expand Down
20 changes: 10 additions & 10 deletions examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1310,7 +1310,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

command ResetCounts(): DefaultSuccess = 0;
command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
}

/** This cluster exposes interactions with a switch device, for the purpose of using those interactions by other devices.
Expand Down Expand Up @@ -1460,22 +1460,22 @@ server cluster OperationalCredentials = 62 {
readonly attribute int16u clusterRevision = 65533;

request struct AttestationRequestRequest {
octet_string attestationNonce = 0;
octet_string<32> attestationNonce = 0;
}

request struct CertificateChainRequestRequest {
CertificateChainTypeEnum certificateType = 0;
}

request struct CSRRequestRequest {
octet_string CSRNonce = 0;
octet_string<32> CSRNonce = 0;
optional boolean isForUpdateNOC = 1;
}

request struct AddNOCRequest {
octet_string NOCValue = 0;
optional octet_string ICACValue = 1;
octet_string IPKValue = 2;
octet_string<400> NOCValue = 0;
optional octet_string<400> ICACValue = 1;
octet_string<16> IPKValue = 2;
int64u caseAdminSubject = 3;
vendor_id adminVendorId = 4;
}
Expand All @@ -1498,12 +1498,12 @@ server cluster OperationalCredentials = 62 {
}

response struct AttestationResponse = 1 {
octet_string attestationElements = 0;
octet_string attestationSignature = 1;
octet_string<900> attestationElements = 0;
octet_string<64> attestationSignature = 1;
}

response struct CertificateChainResponse = 3 {
octet_string certificate = 0;
octet_string<600> certificate = 0;
}

response struct CSRResponse = 5 {
Expand All @@ -1514,7 +1514,7 @@ server cluster OperationalCredentials = 62 {
response struct NOCResponse = 8 {
NodeOperationalCertStatusEnum statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional char_string debugText = 2;
optional char_string<128> debugText = 2;
}

command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
Expand Down
Loading

0 comments on commit e51faad

Please sign in to comment.