Skip to content

Commit b9133f0

Browse files
chshuchshu
committed
Merge branch 'submodule/update_chip_v1.0' into 'main'
Submodule: Update connectedhomeip repo to commit 4f7669b0 in v1.0 branch See merge request app-frameworks/esp-matter!200
2 parents 0d6dbd1 + 8160c16 commit b9133f0

File tree

8 files changed

+62
-62
lines changed

8 files changed

+62
-62
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ git clone --recursive https://github.com/espressif/esp-matter.git
1818

1919
## Supported ESP-IDF and connectedhomeip versions
2020

21-
- This SDK currently works with [commit 26bfa09](https://github.com/espressif/connectedhomeip/tree/26bfa09) of connectedhomeip.
21+
- This SDK currently works with [commit 4f7669b0](https://github.com/espressif/connectedhomeip/tree/4f7669b0) in v1.0 branch of connectedhomeip.
2222
- For Wi-Fi devices (ESP32, ESP32-C3, ESP32-S3), ESP-IDF [v4.4.2 release](https://github.com/espressif/esp-idf/releases/tag/v4.4.2) is required.
2323
- For Thread devices (ESP32-H2) and Zigbee Bridge example, ESP-IDF release/v5.0 branch at [commit ccdeb43](https://github.com/espressif/esp-idf/tree/ccdeb43) should be used.
2424

‎components/esp_matter/esp_matter_attribute.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace attribute {
4545

4646
attribute_t *create_device_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count)
4747
{
48-
return esp_matter::attribute::create(cluster, Descriptor::Attributes::DeviceList::Id, ATTRIBUTE_FLAG_NONE,
48+
return esp_matter::attribute::create(cluster, Descriptor::Attributes::DeviceTypeList::Id, ATTRIBUTE_FLAG_NONE,
4949
esp_matter_array(value, length, count));
5050
}
5151

@@ -1000,7 +1000,7 @@ attribute_t *create_color_capabilities(cluster_t *cluster, uint16_t value)
10001000

10011001
attribute_t *create_color_temperature_mireds(cluster_t *cluster, uint16_t value)
10021002
{
1003-
return esp_matter::attribute::create(cluster, ColorControl::Attributes::ColorTemperature::Id,
1003+
return esp_matter::attribute::create(cluster, ColorControl::Attributes::ColorTemperatureMireds::Id,
10041004
ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_uint16(value));
10051005
}
10061006

‎connectedhomeip/connectedhomeip‎

Submodule connectedhomeip updated 1242 files

‎examples/light/main/app_driver.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ esp_err_t app_driver_attribute_update(app_driver_handle_t driver_handle, uint16_
8989
err = app_driver_light_set_hue(handle, val);
9090
} else if (attribute_id == ColorControl::Attributes::CurrentSaturation::Id) {
9191
err = app_driver_light_set_saturation(handle, val);
92-
} else if (attribute_id == ColorControl::Attributes::ColorTemperature::Id) {
92+
} else if (attribute_id == ColorControl::Attributes::ColorTemperatureMireds::Id) {
9393
err = app_driver_light_set_temperature(handle, val);
9494
}
9595
}
@@ -129,7 +129,7 @@ esp_err_t app_driver_light_set_defaults(uint16_t endpoint_id)
129129
err |= app_driver_light_set_saturation(handle, &val);
130130
} else if (val.val.u8 == EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE) {
131131
/* Setting temperature */
132-
attribute = attribute::get(cluster, ColorControl::Attributes::ColorTemperature::Id);
132+
attribute = attribute::get(cluster, ColorControl::Attributes::ColorTemperatureMireds::Id);
133133
attribute::get_val(attribute, &val);
134134
err |= app_driver_light_set_temperature(handle, &val);
135135
} else {

‎examples/zap_light/main/app_driver.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ esp_err_t app_driver_attribute_update(app_driver_handle_t driver_handle, uint16_
8787
err = app_driver_light_set_hue(handle, val);
8888
} else if (attribute_id == ColorControl::Attributes::CurrentSaturation::Id) {
8989
err = app_driver_light_set_saturation(handle, val);
90-
} else if (attribute_id == ColorControl::Attributes::ColorTemperature::Id) {
90+
} else if (attribute_id == ColorControl::Attributes::ColorTemperatureMireds::Id) {
9191
err = app_driver_light_set_temperature(handle, val);
9292
}
9393
}
@@ -132,7 +132,7 @@ esp_err_t app_driver_light_set_defaults(uint16_t endpoint_id)
132132
err |= app_driver_light_set_saturation(handle, &val);
133133
} else if (value == EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE) {
134134
/* Setting temperature */
135-
attribute_id = ColorControl::Attributes::ColorTemperature::Id;
135+
attribute_id = ColorControl::Attributes::ColorTemperatureMireds::Id;
136136
attribute::get_val_raw(endpoint_id, cluster_id, attribute_id, (uint8_t *)&value_u16, sizeof(uint16_t));
137137
val = esp_matter_uint16(value_u16);
138138
err |= app_driver_light_set_temperature(handle, &val);

‎examples/zap_light/main/zap-generated/endpoint_config.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@
109109
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) }, /* ClusterRevision */ \
110110
\
111111
/* Endpoint: 0, Cluster: Descriptor (server) */ \
112-
{ 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* device list */ \
113-
{ 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* server list */ \
114-
{ 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* client list */ \
115-
{ 0x00000003, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* parts list */ \
112+
{ 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* DeviceTypeList */ \
113+
{ 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ServerList */ \
114+
{ 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClientList */ \
115+
{ 0x00000003, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* PartsList */ \
116116
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
117117
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
118118
\
@@ -504,21 +504,21 @@
504504
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) }, /* ClusterRevision */ \
505505
\
506506
/* Endpoint: 1, Cluster: Descriptor (server) */ \
507-
{ 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* device list */ \
508-
{ 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* server list */ \
509-
{ 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* client list */ \
510-
{ 0x00000003, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* parts list */ \
507+
{ 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* DeviceTypeList */ \
508+
{ 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ServerList */ \
509+
{ 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClientList */ \
510+
{ 0x00000003, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* PartsList */ \
511511
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
512512
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
513513
\
514514
/* Endpoint: 1, Cluster: Color Control (server) */ \
515-
{ 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentHue */ \
516-
{ 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentSaturation */ \
517-
{ 0x00000002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* RemainingTime */ \
518-
{ 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x616B) }, /* CurrentX */ \
519-
{ 0x00000004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x607D) }, /* CurrentY */ \
520-
{ 0x00000007, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x00FA) }, /* ColorTemperature */ \
521-
{ 0x00000008, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* ColorMode */ \
515+
{ 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentHue */ \
516+
{ 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentSaturation */ \
517+
{ 0x00000002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* RemainingTime */ \
518+
{ 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x616B) }, /* CurrentX */ \
519+
{ 0x00000004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x607D) }, /* CurrentY */ \
520+
{ 0x00000007, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x00FA) }, /* ColorTemperatureMireds */ \
521+
{ 0x00000008, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* ColorMode */ \
522522
{ 0x0000000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x00) }, /* Options */ \
523523
{ 0x00000010, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* NumberOfPrimaries */ \
524524
{ 0x00004000, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* EnhancedCurrentHue */ \

‎examples/zap_light/main/zap-generated/light.matter‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -267,12 +267,12 @@ server cluster LevelControl = 8 {
267267
}
268268

269269
server cluster Descriptor = 29 {
270-
struct DeviceType {
270+
struct DeviceTypeStruct {
271271
devtype_id type = 0;
272272
int16u revision = 1;
273273
}
274274

275-
readonly attribute DeviceType deviceList[] = 0;
275+
readonly attribute DeviceTypeStruct deviceTypeList[] = 0;
276276
readonly attribute CLUSTER_ID serverList[] = 1;
277277
readonly attribute CLUSTER_ID clientList[] = 2;
278278
readonly attribute ENDPOINT_NO partsList[] = 3;
@@ -420,30 +420,30 @@ client cluster OtaSoftwareUpdateProvider = 41 {
420420
INT32U softwareVersion = 2;
421421
OTADownloadProtocol protocolsSupported[] = 3;
422422
optional INT16U hardwareVersion = 4;
423-
optional CHAR_STRING location = 5;
423+
optional CHAR_STRING<2> location = 5;
424424
optional BOOLEAN requestorCanConsent = 6;
425-
optional OCTET_STRING metadataForProvider = 7;
425+
optional OCTET_STRING<512> metadataForProvider = 7;
426426
}
427427

428428
request struct ApplyUpdateRequestRequest {
429-
OCTET_STRING updateToken = 0;
429+
OCTET_STRING<32> updateToken = 0;
430430
INT32U newVersion = 1;
431431
}
432432

433433
request struct NotifyUpdateAppliedRequest {
434-
OCTET_STRING updateToken = 0;
434+
OCTET_STRING<32> updateToken = 0;
435435
INT32U softwareVersion = 1;
436436
}
437437

438438
response struct QueryImageResponse = 1 {
439439
OTAQueryStatus status = 0;
440440
optional INT32U delayedActionTime = 1;
441-
optional CHAR_STRING imageURI = 2;
441+
optional CHAR_STRING<256> imageURI = 2;
442442
optional INT32U softwareVersion = 3;
443-
optional CHAR_STRING softwareVersionString = 4;
444-
optional OCTET_STRING updateToken = 5;
443+
optional CHAR_STRING<64> softwareVersionString = 4;
444+
optional OCTET_STRING<32> updateToken = 5;
445445
optional BOOLEAN userConsentNeeded = 6;
446-
optional OCTET_STRING metadataForRequestor = 7;
446+
optional OCTET_STRING<512> metadataForRequestor = 7;
447447
}
448448

449449
response struct ApplyUpdateResponse = 3 {
@@ -519,7 +519,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
519519
node_id providerNodeId = 0;
520520
vendor_id vendorId = 1;
521521
OTAAnnouncementReason announcementReason = 2;
522-
optional OCTET_STRING metadataForNode = 3;
522+
optional OCTET_STRING<512> metadataForNode = 3;
523523
endpoint_no endpoint = 4;
524524
}
525525

@@ -696,33 +696,33 @@ server cluster NetworkCommissioning = 49 {
696696
readonly attribute int16u clusterRevision = 65533;
697697

698698
request struct ScanNetworksRequest {
699-
optional nullable OCTET_STRING ssid = 0;
699+
optional nullable OCTET_STRING<32> ssid = 0;
700700
optional INT64U breadcrumb = 1;
701701
}
702702

703703
request struct AddOrUpdateWiFiNetworkRequest {
704-
OCTET_STRING ssid = 0;
705-
OCTET_STRING credentials = 1;
704+
OCTET_STRING<32> ssid = 0;
705+
OCTET_STRING<64> credentials = 1;
706706
optional INT64U breadcrumb = 2;
707707
}
708708

709709
request struct AddOrUpdateThreadNetworkRequest {
710-
OCTET_STRING operationalDataset = 0;
710+
OCTET_STRING<254> operationalDataset = 0;
711711
optional INT64U breadcrumb = 1;
712712
}
713713

714714
request struct RemoveNetworkRequest {
715-
OCTET_STRING networkID = 0;
715+
OCTET_STRING<32> networkID = 0;
716716
optional INT64U breadcrumb = 1;
717717
}
718718

719719
request struct ConnectNetworkRequest {
720-
OCTET_STRING networkID = 0;
720+
OCTET_STRING<32> networkID = 0;
721721
optional INT64U breadcrumb = 1;
722722
}
723723

724724
request struct ReorderNetworkRequest {
725-
OCTET_STRING networkID = 0;
725+
OCTET_STRING<32> networkID = 0;
726726
INT8U networkIndex = 1;
727727
optional INT64U breadcrumb = 2;
728728
}
@@ -736,7 +736,7 @@ server cluster NetworkCommissioning = 49 {
736736

737737
response struct NetworkConfigResponse = 5 {
738738
NetworkCommissioningStatus networkingStatus = 0;
739-
optional CHAR_STRING debugText = 1;
739+
optional CHAR_STRING<512> debugText = 1;
740740
optional INT8U networkIndex = 2;
741741
}
742742

@@ -780,7 +780,7 @@ server cluster DiagnosticLogs = 50 {
780780
request struct RetrieveLogsRequestRequest {
781781
LogsIntent intent = 0;
782782
LogsTransferProtocol requestedProtocol = 1;
783-
OCTET_STRING transferFileDesignator = 2;
783+
OCTET_STRING<32> transferFileDesignator = 2;
784784
}
785785

786786
command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
@@ -879,7 +879,7 @@ server cluster GeneralDiagnostics = 51 {
879879
readonly attribute int16u clusterRevision = 65533;
880880

881881
request struct TestEventTriggerRequest {
882-
OCTET_STRING enableKey = 0;
882+
OCTET_STRING<16> enableKey = 0;
883883
INT64U eventTrigger = 1;
884884
}
885885

@@ -1301,7 +1301,7 @@ server cluster OperationalCredentials = 62 {
13011301
}
13021302

13031303
request struct UpdateFabricLabelRequest {
1304-
CHAR_STRING label = 0;
1304+
CHAR_STRING<32> label = 0;
13051305
}
13061306

13071307
request struct RemoveFabricRequest {
@@ -1496,7 +1496,7 @@ server cluster ColorControl = 768 {
14961496
readonly attribute int16u remainingTime = 2;
14971497
readonly attribute int16u currentX = 3;
14981498
readonly attribute int16u currentY = 4;
1499-
readonly attribute int16u colorTemperature = 7;
1499+
readonly attribute int16u colorTemperatureMireds = 7;
15001500
readonly attribute enum8 colorMode = 8;
15011501
attribute bitmap8 options = 15;
15021502
readonly attribute nullable int8u numberOfPrimaries = 16;
@@ -1703,7 +1703,7 @@ endpoint 0 {
17031703
}
17041704

17051705
server cluster Descriptor {
1706-
callback attribute deviceList;
1706+
callback attribute deviceTypeList;
17071707
callback attribute serverList;
17081708
callback attribute clientList;
17091709
callback attribute partsList;
@@ -2013,7 +2013,7 @@ endpoint 1 {
20132013
}
20142014

20152015
server cluster Descriptor {
2016-
callback attribute deviceList;
2016+
callback attribute deviceTypeList;
20172017
callback attribute serverList;
20182018
callback attribute clientList;
20192019
callback attribute partsList;
@@ -2027,7 +2027,7 @@ endpoint 1 {
20272027
ram attribute remainingTime;
20282028
ram attribute currentX default = 0x616B;
20292029
ram attribute currentY default = 0x607D;
2030-
ram attribute colorTemperature default = 0x00FA;
2030+
ram attribute colorTemperatureMireds default = 0x00FA;
20312031
ram attribute colorMode default = 0x01;
20322032
ram attribute options;
20332033
ram attribute numberOfPrimaries;

0 commit comments

Comments
 (0)