Skip to content

Commit

Permalink
Merge branch 'master' into feature/update-existing-media-clusters-2
Browse files Browse the repository at this point in the history
  • Loading branch information
lazarkov authored Nov 30, 2023
2 parents 02f75f8 + d823ea2 commit 7389438
Show file tree
Hide file tree
Showing 155 changed files with 682 additions and 538 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -634,13 +634,13 @@ cluster NetworkCommissioning = 49 {
}

request struct QueryIdentityRequest {
OCTET_STRING<20> keyIdentifier = 0;
optional OCTET_STRING<32> possessionNonce = 1;
octet_string<20> keyIdentifier = 0;
optional octet_string<32> possessionNonce = 1;
}

response struct QueryIdentityResponse = 10 {
OCTET_STRING<140> identity = 0;
optional OCTET_STRING<64> possessionSignature = 1;
octet_string<140> identity = 0;
optional octet_string<64> possessionSignature = 1;
}

/** Detemine the set of networks the device sees as available. */
Expand Down Expand Up @@ -697,7 +697,7 @@ cluster DiagnosticLogs = 50 {

response struct RetrieveLogsResponse = 1 {
StatusEnum status = 0;
LONG_OCTET_STRING logContent = 1;
long_octet_string logContent = 1;
optional epoch_us UTCTimeStamp = 2;
optional systime_us timeSinceBoot = 3;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -634,13 +634,13 @@ cluster NetworkCommissioning = 49 {
}

request struct QueryIdentityRequest {
OCTET_STRING<20> keyIdentifier = 0;
optional OCTET_STRING<32> possessionNonce = 1;
octet_string<20> keyIdentifier = 0;
optional octet_string<32> possessionNonce = 1;
}

response struct QueryIdentityResponse = 10 {
OCTET_STRING<140> identity = 0;
optional OCTET_STRING<64> possessionSignature = 1;
octet_string<140> identity = 0;
optional octet_string<64> possessionSignature = 1;
}

/** Detemine the set of networks the device sees as available. */
Expand Down
2 changes: 2 additions & 0 deletions examples/air-quality-sensor-app/telink/include/AppConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@
#define APP_USE_THREAD_START_BUTTON 0
#define APP_SET_DEVICE_INFO_PROVIDER 1
#define APP_SET_NETWORK_COMM_ENDPOINT_SEC 0
#if defined(CONFIG_BOARD_TLSR9518ADK80D) || defined(CONFIG_BOARD_TLSR9528A)
#define APP_USE_IDENTIFY_PWM 1
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -1763,13 +1763,13 @@ cluster NetworkCommissioning = 49 {
}

request struct QueryIdentityRequest {
OCTET_STRING<20> keyIdentifier = 0;
optional OCTET_STRING<32> possessionNonce = 1;
octet_string<20> keyIdentifier = 0;
optional octet_string<32> possessionNonce = 1;
}

response struct QueryIdentityResponse = 10 {
OCTET_STRING<140> identity = 0;
optional OCTET_STRING<64> possessionSignature = 1;
octet_string<140> identity = 0;
optional octet_string<64> possessionSignature = 1;
}

/** Detemine the set of networks the device sees as available. */
Expand Down Expand Up @@ -1826,7 +1826,7 @@ cluster DiagnosticLogs = 50 {

response struct RetrieveLogsResponse = 1 {
StatusEnum status = 0;
LONG_OCTET_STRING logContent = 1;
long_octet_string logContent = 1;
optional epoch_us UTCTimeStamp = 2;
optional systime_us timeSinceBoot = 3;
}
Expand Down Expand Up @@ -5649,7 +5649,7 @@ internal cluster UnitTesting = 4294048773 {
attribute int8s rangeRestrictedInt8s = 39;
attribute int16u rangeRestrictedInt16u = 40;
attribute int16s rangeRestrictedInt16s = 41;
attribute LONG_OCTET_STRING listLongOctetString[] = 42;
attribute long_octet_string listLongOctetString[] = 42;
attribute TestFabricScoped listFabricScoped[] = 43;
timedwrite attribute boolean timedWriteBoolean = 48;
attribute boolean generalErrorBoolean = 49;
Expand Down
2 changes: 2 additions & 0 deletions examples/all-clusters-app/telink/include/AppConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,6 @@
#define APP_USE_THREAD_START_BUTTON 1
#define APP_SET_DEVICE_INFO_PROVIDER 1
#define APP_SET_NETWORK_COMM_ENDPOINT_SEC 1
#if defined(CONFIG_BOARD_TLSR9518ADK80D) || defined(CONFIG_BOARD_TLSR9528A)
#define APP_USE_IDENTIFY_PWM 1
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -1643,13 +1643,13 @@ cluster NetworkCommissioning = 49 {
}

request struct QueryIdentityRequest {
OCTET_STRING<20> keyIdentifier = 0;
optional OCTET_STRING<32> possessionNonce = 1;
octet_string<20> keyIdentifier = 0;
optional octet_string<32> possessionNonce = 1;
}

response struct QueryIdentityResponse = 10 {
OCTET_STRING<140> identity = 0;
optional OCTET_STRING<64> possessionSignature = 1;
octet_string<140> identity = 0;
optional octet_string<64> possessionSignature = 1;
}

/** Detemine the set of networks the device sees as available. */
Expand Down Expand Up @@ -1706,7 +1706,7 @@ cluster DiagnosticLogs = 50 {

response struct RetrieveLogsResponse = 1 {
StatusEnum status = 0;
LONG_OCTET_STRING logContent = 1;
long_octet_string logContent = 1;
optional epoch_us UTCTimeStamp = 2;
optional systime_us timeSinceBoot = 3;
}
Expand Down Expand Up @@ -3137,7 +3137,7 @@ cluster DoorLock = 257 {
request struct SetCredentialRequest {
DataOperationTypeEnum operationType = 0;
CredentialStruct credential = 1;
LONG_OCTET_STRING credentialData = 2;
long_octet_string credentialData = 2;
nullable int16u userIndex = 3;
nullable UserStatusEnum userStatus = 4;
nullable UserTypeEnum userType = 5;
Expand Down Expand Up @@ -5334,7 +5334,7 @@ internal cluster UnitTesting = 4294048773 {
attribute int8s rangeRestrictedInt8s = 39;
attribute int16u rangeRestrictedInt16u = 40;
attribute int16s rangeRestrictedInt16s = 41;
attribute LONG_OCTET_STRING listLongOctetString[] = 42;
attribute long_octet_string listLongOctetString[] = 42;
attribute TestFabricScoped listFabricScoped[] = 43;
timedwrite attribute boolean timedWriteBoolean = 48;
attribute boolean generalErrorBoolean = 49;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@
#define APP_USE_THREAD_START_BUTTON 0
#define APP_SET_DEVICE_INFO_PROVIDER 0
#define APP_SET_NETWORK_COMM_ENDPOINT_SEC 1
#define APP_USE_IDENTIFY_PWM 0
10 changes: 5 additions & 5 deletions examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1035,13 +1035,13 @@ cluster NetworkCommissioning = 49 {
}

request struct QueryIdentityRequest {
OCTET_STRING<20> keyIdentifier = 0;
optional OCTET_STRING<32> possessionNonce = 1;
octet_string<20> keyIdentifier = 0;
optional octet_string<32> possessionNonce = 1;
}

response struct QueryIdentityResponse = 10 {
OCTET_STRING<140> identity = 0;
optional OCTET_STRING<64> possessionSignature = 1;
octet_string<140> identity = 0;
optional octet_string<64> possessionSignature = 1;
}

/** Detemine the set of networks the device sees as available. */
Expand Down Expand Up @@ -1098,7 +1098,7 @@ cluster DiagnosticLogs = 50 {

response struct RetrieveLogsResponse = 1 {
StatusEnum status = 0;
LONG_OCTET_STRING logContent = 1;
long_octet_string logContent = 1;
optional epoch_us UTCTimeStamp = 2;
optional systime_us timeSinceBoot = 3;
}
Expand Down
2 changes: 2 additions & 0 deletions examples/bridge-app/telink/include/AppConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@
#define APP_USE_THREAD_START_BUTTON 1
#define APP_SET_DEVICE_INFO_PROVIDER 1
#define APP_SET_NETWORK_COMM_ENDPOINT_SEC 0
#if defined(CONFIG_BOARD_TLSR9518ADK80D) || defined(CONFIG_BOARD_TLSR9528A)
#define APP_USE_IDENTIFY_PWM 1
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ cluster DiagnosticLogs = 50 {

response struct RetrieveLogsResponse = 1 {
StatusEnum status = 0;
LONG_OCTET_STRING logContent = 1;
long_octet_string logContent = 1;
optional epoch_us UTCTimeStamp = 2;
optional systime_us timeSinceBoot = 3;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -557,13 +557,13 @@ cluster NetworkCommissioning = 49 {
}

request struct QueryIdentityRequest {
OCTET_STRING<20> keyIdentifier = 0;
optional OCTET_STRING<32> possessionNonce = 1;
octet_string<20> keyIdentifier = 0;
optional octet_string<32> possessionNonce = 1;
}

response struct QueryIdentityResponse = 10 {
OCTET_STRING<140> identity = 0;
optional OCTET_STRING<64> possessionSignature = 1;
octet_string<140> identity = 0;
optional octet_string<64> possessionSignature = 1;
}

/** Detemine the set of networks the device sees as available. */
Expand Down Expand Up @@ -620,7 +620,7 @@ cluster DiagnosticLogs = 50 {

response struct RetrieveLogsResponse = 1 {
StatusEnum status = 0;
LONG_OCTET_STRING logContent = 1;
long_octet_string logContent = 1;
optional epoch_us UTCTimeStamp = 2;
optional systime_us timeSinceBoot = 3;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -693,13 +693,13 @@ cluster NetworkCommissioning = 49 {
}

request struct QueryIdentityRequest {
OCTET_STRING<20> keyIdentifier = 0;
optional OCTET_STRING<32> possessionNonce = 1;
octet_string<20> keyIdentifier = 0;
optional octet_string<32> possessionNonce = 1;
}

response struct QueryIdentityResponse = 10 {
OCTET_STRING<140> identity = 0;
optional OCTET_STRING<64> possessionSignature = 1;
octet_string<140> identity = 0;
optional octet_string<64> possessionSignature = 1;
}

/** Detemine the set of networks the device sees as available. */
Expand Down Expand Up @@ -756,7 +756,7 @@ cluster DiagnosticLogs = 50 {

response struct RetrieveLogsResponse = 1 {
StatusEnum status = 0;
LONG_OCTET_STRING logContent = 1;
long_octet_string logContent = 1;
optional epoch_us UTCTimeStamp = 2;
optional systime_us timeSinceBoot = 3;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -715,13 +715,13 @@ cluster NetworkCommissioning = 49 {
}

request struct QueryIdentityRequest {
OCTET_STRING<20> keyIdentifier = 0;
optional OCTET_STRING<32> possessionNonce = 1;
octet_string<20> keyIdentifier = 0;
optional octet_string<32> possessionNonce = 1;
}

response struct QueryIdentityResponse = 10 {
OCTET_STRING<140> identity = 0;
optional OCTET_STRING<64> possessionSignature = 1;
octet_string<140> identity = 0;
optional octet_string<64> possessionSignature = 1;
}

/** Detemine the set of networks the device sees as available. */
Expand Down Expand Up @@ -778,7 +778,7 @@ cluster DiagnosticLogs = 50 {

response struct RetrieveLogsResponse = 1 {
StatusEnum status = 0;
LONG_OCTET_STRING logContent = 1;
long_octet_string logContent = 1;
optional epoch_us UTCTimeStamp = 2;
optional systime_us timeSinceBoot = 3;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -908,13 +908,13 @@ cluster NetworkCommissioning = 49 {
}

request struct QueryIdentityRequest {
OCTET_STRING<20> keyIdentifier = 0;
optional OCTET_STRING<32> possessionNonce = 1;
octet_string<20> keyIdentifier = 0;
optional octet_string<32> possessionNonce = 1;
}

response struct QueryIdentityResponse = 10 {
OCTET_STRING<140> identity = 0;
optional OCTET_STRING<64> possessionSignature = 1;
octet_string<140> identity = 0;
optional octet_string<64> possessionSignature = 1;
}

/** Detemine the set of networks the device sees as available. */
Expand Down Expand Up @@ -971,7 +971,7 @@ cluster DiagnosticLogs = 50 {

response struct RetrieveLogsResponse = 1 {
StatusEnum status = 0;
LONG_OCTET_STRING logContent = 1;
long_octet_string logContent = 1;
optional epoch_us UTCTimeStamp = 2;
optional systime_us timeSinceBoot = 3;
}
Expand Down
10 changes: 5 additions & 5 deletions examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
Original file line number Diff line number Diff line change
Expand Up @@ -791,13 +791,13 @@ cluster NetworkCommissioning = 49 {
}

request struct QueryIdentityRequest {
OCTET_STRING<20> keyIdentifier = 0;
optional OCTET_STRING<32> possessionNonce = 1;
octet_string<20> keyIdentifier = 0;
optional octet_string<32> possessionNonce = 1;
}

response struct QueryIdentityResponse = 10 {
OCTET_STRING<140> identity = 0;
optional OCTET_STRING<64> possessionSignature = 1;
octet_string<140> identity = 0;
optional octet_string<64> possessionSignature = 1;
}

/** Detemine the set of networks the device sees as available. */
Expand Down Expand Up @@ -854,7 +854,7 @@ cluster DiagnosticLogs = 50 {

response struct RetrieveLogsResponse = 1 {
StatusEnum status = 0;
LONG_OCTET_STRING logContent = 1;
long_octet_string logContent = 1;
optional epoch_us UTCTimeStamp = 2;
optional systime_us timeSinceBoot = 3;
}
Expand Down
10 changes: 5 additions & 5 deletions examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
Original file line number Diff line number Diff line change
Expand Up @@ -988,13 +988,13 @@ cluster NetworkCommissioning = 49 {
}

request struct QueryIdentityRequest {
OCTET_STRING<20> keyIdentifier = 0;
optional OCTET_STRING<32> possessionNonce = 1;
octet_string<20> keyIdentifier = 0;
optional octet_string<32> possessionNonce = 1;
}

response struct QueryIdentityResponse = 10 {
OCTET_STRING<140> identity = 0;
optional OCTET_STRING<64> possessionSignature = 1;
octet_string<140> identity = 0;
optional octet_string<64> possessionSignature = 1;
}

/** Detemine the set of networks the device sees as available. */
Expand Down Expand Up @@ -1051,7 +1051,7 @@ cluster DiagnosticLogs = 50 {

response struct RetrieveLogsResponse = 1 {
StatusEnum status = 0;
LONG_OCTET_STRING logContent = 1;
long_octet_string logContent = 1;
optional epoch_us UTCTimeStamp = 2;
optional systime_us timeSinceBoot = 3;
}
Expand Down
8 changes: 4 additions & 4 deletions examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
Original file line number Diff line number Diff line change
Expand Up @@ -565,13 +565,13 @@ cluster NetworkCommissioning = 49 {
}

request struct QueryIdentityRequest {
OCTET_STRING<20> keyIdentifier = 0;
optional OCTET_STRING<32> possessionNonce = 1;
octet_string<20> keyIdentifier = 0;
optional octet_string<32> possessionNonce = 1;
}

response struct QueryIdentityResponse = 10 {
OCTET_STRING<140> identity = 0;
optional OCTET_STRING<64> possessionSignature = 1;
octet_string<140> identity = 0;
optional octet_string<64> possessionSignature = 1;
}

/** Detemine the set of networks the device sees as available. */
Expand Down
Loading

0 comments on commit 7389438

Please sign in to comment.