espressif/esp-matter
1
0
Fork 0
mirror of https://github.com/espressif/esp-matter.git synced 2026-04-27 19:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

connectedhomeip: Update connectedhomeip submodule to f6c3c8382

Browse Source
This commit is contained in:
WanqQixiang
2025-04-24 14:42:13 +08:00
parent 29e1c9b993
commit bd3f00bbd2
11 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+1 -1
View File
@@ -26,7 +26,7 @@ variables:
IDF_CHECKOUT_REF: "v5.4.1"
# This variable represents the short hash of the connectedhomeip submodule.
# Note: Do change this short hash on submodule update MRs.
CHIP_SHORT_HASH: "326cabf99c"
CHIP_SHORT_HASH: "f6c3c83820"
DOCKER_IMAGE_NAME: "espressif/chip-idf"
.add_gitlab_ssh_key: &add_gitlab_ssh_key |
README.md
+1 -1
View File
@@ -28,7 +28,7 @@ section in the ESP-Matter Programming Guide.
## Supported ESP-IDF and connectedhomeip versions
- This SDK currently works with commit [326cabf99c](https://github.com/project-chip/connectedhomeip/tree/326cabf99c) of connectedhomeip.
- This SDK currently works with commit [f6c3c83820](https://github.com/project-chip/connectedhomeip/tree/326cabf99c) of connectedhomeip.
- For Matter projects development with this SDK, it is recommended to utilize ESP-IDF [v5.4.1](https://github.com/espressif/esp-idf/tree/v5.4.1).
## Documentation
components/esp_matter/CMakeLists.txt
+3 -1
View File
@@ -8,6 +8,7 @@ set(SRC_DIRS_LIST "."
"${MATTER_SDK_PATH}/src/app/reporting"
# TODO Use esp-matter data model and remove ember codes
"${MATTER_SDK_PATH}/src/data-model-providers/codegen"
"${MATTER_SDK_PATH}/src/app/server-cluster"
)
set(INCLUDE_DIRS_LIST "."
@@ -16,7 +17,8 @@ set(INCLUDE_DIRS_LIST "."
"${MATTER_SDK_PATH}/third_party/nlfaultinjection/include"
"${MATTER_SDK_PATH}/src")
set(EXCLUDE_SRCS_LIST )
# TODO: This file has compilation errors
set(EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/app/clusters/closure-control-server/closure-control-server.cpp")
if (CONFIG_ESP_MATTER_ENABLE_DATA_MODEL)
include("utils/cluster_select/cluster_dir.cmake")
components/esp_matter/utils/cluster_select/Kconfig.in
+8
View File
@@ -53,6 +53,10 @@ config SUPPORT_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER
bool "Support BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER"
default y
config SUPPORT_CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER
bool "Support CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER"
default y
config SUPPORT_CAMERA_AV_STREAM_MANAGEMENT_CLUSTER
bool "Support CAMERA_AV_STREAM_MANAGEMENT_CLUSTER"
default y
@@ -77,6 +81,10 @@ config SUPPORT_CLOSURE_CONTROL_CLUSTER
bool "Support CLOSURE_CONTROL_CLUSTER"
default y
config SUPPORT_CLOSURE_DIMENSION_CLUSTER
bool "Support CLOSURE_DIMENSION_CLUSTER"
default y
config SUPPORT_COLOR_CONTROL_CLUSTER
bool "Support COLOR_CONTROL_CLUSTER"
default y
components/esp_matter/utils/cluster_select/cluster_dir.cmake
+6
View File
@@ -42,6 +42,9 @@ function(get_supported_cluster_dirs source_dirs)
if(CONFIG_SUPPORT_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER)
list(APPEND temp_list "${MATTER_SDK_PATH}/src/app/clusters/bridged-device-basic-information-server")
endif()
if(CONFIG_SUPPORT_CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER)
list(APPEND temp_list "${MATTER_SDK_PATH}/src/app/clusters/camera-av-settings-user-level-management-server")
endif()
if(CONFIG_SUPPORT_CAMERA_AV_STREAM_MANAGEMENT_CLUSTER)
list(APPEND temp_list "${MATTER_SDK_PATH}/src/app/clusters/camera-av-stream-management-server")
endif()
@@ -60,6 +63,9 @@ function(get_supported_cluster_dirs source_dirs)
if(CONFIG_SUPPORT_CLOSURE_CONTROL_CLUSTER)
list(APPEND temp_list "${MATTER_SDK_PATH}/src/app/clusters/closure-control-server")
endif()
if(CONFIG_SUPPORT_CLOSURE_DIMENSION_CLUSTER)
list(APPEND temp_list "${MATTER_SDK_PATH}/src/app/clusters/closure-dimension-server")
endif()
if(CONFIG_SUPPORT_COLOR_CONTROL_CLUSTER)
list(APPEND temp_list "${MATTER_SDK_PATH}/src/app/clusters/color-control-server")
endif()
components/esp_matter/zap_common/app/PluginApplicationCallbacks.h
+1
View File
@@ -39,6 +39,7 @@ void MatterDishwasherModePluginServerInitCallback();
void MatterDoorLockPluginServerInitCallback();
void MatterEcosystemInformationPluginServerInitCallback();
void MatterElectricalEnergyMeasurementPluginServerInitCallback();
void MatterElectricalGridConditionsPluginServerInitCallback();
void MatterElectricalPowerMeasurementPluginServerInitCallback();
void MatterEnergyEvsePluginServerInitCallback();
void MatterEnergyEvseModePluginServerInitCallback();
components/esp_matter/zap_common/app/callback-stub.cpp
+5
View File
@@ -201,6 +201,11 @@ void __attribute__((weak)) emberAfElectricalEnergyMeasurementClusterInitCallback
// To prevent warning
(void) endpoint;
}
void __attribute__((weak)) emberAfElectricalGridConditionsClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
(void) endpoint;
}
void __attribute__((weak)) emberAfElectricalPowerMeasurementClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
components/esp_matter/zap_common/app/cluster-init-callback.cpp
+3
View File
@@ -130,6 +130,9 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
case app::Clusters::ElectricalEnergyMeasurement::Id:
emberAfElectricalEnergyMeasurementClusterInitCallback(endpoint);
break;
case app::Clusters::ElectricalGridConditions::Id:
emberAfElectricalGridConditionsClusterInitCallback(endpoint);
break;
case app::Clusters::ElectricalPowerMeasurement::Id:
emberAfElectricalPowerMeasurementClusterInitCallback(endpoint);
break;
components/esp_matter/zap_common/zap-generated/access.h
+6
View File
@@ -191,6 +191,7 @@
0x0000002D, /* Cluster: Unit Localization, Attribute: TemperatureUnit, Privilege: manage */ \
0x00000030, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
0x00000031, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
0x00000039, /* Cluster: Bridged Device Basic Information, Attribute: NodeLabel, Privilege: manage */ \
0x0000003F, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
0x00000041, /* Cluster: User Label, Attribute: LabelList, Privilege: manage */ \
0x0000005C, /* Cluster: Smoke CO Alarm, Attribute: SmokeSensitivityLevel, Privilege: manage */ \
@@ -315,6 +316,7 @@
0x00000000, /* Cluster: Unit Localization, Attribute: TemperatureUnit, Privilege: manage */ \
0x00000000, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
0x00000004, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
0x00000005, /* Cluster: Bridged Device Basic Information, Attribute: NodeLabel, Privilege: manage */ \
0x00000000, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
0x00000000, /* Cluster: User Label, Attribute: LabelList, Privilege: manage */ \
0x0000000B, /* Cluster: Smoke CO Alarm, Attribute: SmokeSensitivityLevel, Privilege: manage */ \
@@ -439,6 +441,7 @@
chip::Access::Privilege::kManage, /* Cluster: Unit Localization, Attribute: TemperatureUnit, Privilege: manage */ \
chip::Access::Privilege::kAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
chip::Access::Privilege::kManage, /* Cluster: Bridged Device Basic Information, Attribute: NodeLabel, Privilege: manage */ \
chip::Access::Privilege::kManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
chip::Access::Privilege::kManage, /* Cluster: User Label, Attribute: LabelList, Privilege: manage */ \
chip::Access::Privilege::kManage, /* Cluster: Smoke CO Alarm, Attribute: SmokeSensitivityLevel, Privilege: manage */ \
@@ -912,6 +915,7 @@
0x0000001F, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
0x0000050E, /* Cluster: Account Login, Event: LoggedOut, Privilege: administer */ \
0x00000751, /* Cluster: Commissioner Control, Event: CommissioningRequestResult, Privilege: manage */ \
}
@@ -920,6 +924,7 @@
0x00000000, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
0x00000001, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
0x00000002, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
0x00000000, /* Cluster: Account Login, Event: LoggedOut, Privilege: administer */ \
0x00000000, /* Cluster: Commissioner Control, Event: CommissioningRequestResult, Privilege: manage */ \
}
@@ -928,6 +933,7 @@
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Account Login, Event: LoggedOut, Privilege: administer */ \
chip::Access::Privilege::kManage, /* Cluster: Commissioner Control, Event: CommissioningRequestResult, Privilege: manage */ \
}
connectedhomeip/connectedhomeip
+1 -1
Submodule connectedhomeip/connectedhomeip updated: 326cabf99c...f6c3c83820
examples/light/sdkconfig.defaults
+3
View File
@@ -50,10 +50,13 @@ CONFIG_SUPPORT_APPLICATION_LAUNCHER_CLUSTER=n
CONFIG_SUPPORT_AUDIO_OUTPUT_CLUSTER=n
CONFIG_SUPPORT_BOOLEAN_STATE_CONFIGURATION_CLUSTER=n
CONFIG_SUPPORT_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER=n
CONFIG_SUPPORT_CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER=n
CONFIG_SUPPORT_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER=n
CONFIG_SUPPORT_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER=n
CONFIG_SUPPORT_CHANNEL_CLUSTER=n
CONFIG_SUPPORT_CHIME_CLUSTER=n
CONFIG_SUPPORT_CLOSURE_CONTROL_CLUSTER=n
CONFIG_SUPPORT_CLOSURE_DIMENSION_CLUSTER=n
CONFIG_SUPPORT_COMMISSIONER_CONTROL_CLUSTER=n
CONFIG_SUPPORT_CONTENT_LAUNCHER_CLUSTER=n
CONFIG_SUPPORT_CONTENT_CONTROL_CLUSTER=n