Skip to content

Commit d4cbddc

Browse files
chshuchshu
committed
Merge branch 'add_connectedhomeip_component' into 'main'
Add matter component based on esp-matter sdk and connectedhomeip See merge request app-frameworks/esp-matter!552
2 parents 9b86dec + d951642 commit d4cbddc

File tree

7 files changed

+1372
-0
lines changed

7 files changed

+1372
-0
lines changed

‎.github/workflows/upload_component.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Push components to Espressif Component Service
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
upload_components:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- name: Upload components to component service
14+
uses: espressif/upload-components-ci-action@v1
15+
with:
16+
name: "esp_matter"
17+
namespace: "espressif"
18+
api_token: ${{ secrets.IDF_COMPONENT_API_TOKEN }}

‎.gitlab-ci.yml

+28
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,25 @@ variables:
154154
REPOS_PATH: "$CI_PROJECT_DIR/repos"
155155
IDF_CCACHE_ENABLE: 1
156156

157+
.build_managed_component_light_example:
158+
stage: build
159+
image: gitlab.espressif.cn:5050/app-frameworks/esp-matter/build-env:latest
160+
tags:
161+
- build
162+
- matter_cache
163+
before_script:
164+
- *add_gitlab_ssh_key
165+
- *get_build_caches
166+
- *chip_submodule_update
167+
- *setup_idf
168+
- cd ${ESP_MATTER_PATH}
169+
- mkdir -p ${REPOS_PATH}
170+
- *update_build_caches
171+
variables:
172+
IDF_VERSION: "v5.1.2"
173+
REPOS_PATH: "$CI_PROJECT_DIR/repos"
174+
IDF_CCACHE_ENABLE: 1
175+
157176
build_esp_matter_examples_pytest_C6_idf_v5_1:
158177
extends:
159178
- .build_examples_template
@@ -305,6 +324,15 @@ build_upstream_examples:
305324
script:
306325
- *build_matter_examples
307326

327+
build_managed_component_light:
328+
extends:
329+
- .build_managed_component_light_example
330+
when: manual
331+
script:
332+
- cd ${ESP_MATTER_PATH}/examples/managed_component_light
333+
- idf.py set-target esp32c3
334+
- idf.py build
335+
308336
build_docs:
309337
stage: build
310338
image: $CI_DOCKER_REGISTRY/esp-idf-doc-env-v5.1:1-1

‎CMakeLists.txt

+454
Large diffs are not rendered by default.

‎Kconfig

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
rsource "connectedhomeip/connectedhomeip/config/esp32/components/chip/Kconfig"
2+
rsource "components/esp_matter/Kconfig"
3+
rsource "components/esp_matter_bridge/Kconfig"
4+
rsource "components/esp_matter_console/Kconfig"
5+
rsource "components/esp_matter_controller/Kconfig"

‎examples/common/blemesh_platform/platform/ESP32_custom/external_platform.cmake

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
# check the source file dirs
2+
set(EXPLANT_SRC_DIRS_LIST "${CMAKE_CURRENT_LIST_DIR}/"
3+
"${CMAKE_CURRENT_LIST_DIR}/route_hook")
4+
5+
set(EXPLANT_INCLUDE_DIRS_LIST "${CMAKE_CURRENT_LIST_DIR}/../../"
6+
"${CMAKE_CURRENT_LIST_DIR}"
7+
"${CMAKE_CURRENT_LIST_DIR}/bluedroid"
8+
"${CMAKE_CURRENT_LIST_DIR}/nimble"
9+
"${CMAKE_CURRENT_LIST_DIR}/route_hook")
10+
11+
set(EXPLANT_EXCLUDE_SRCS_LIST)
12+
13+
if (CONFIG_USE_MINIMAL_MDNS)
14+
list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/DnssdImpl.cpp")
15+
endif()
16+
17+
if ((CONFIG_USE_MINIMAL_MDNS) OR ((NOT CONFIG_ENABLE_WIFI_STATION) AND (NOT CONFIG_ENABLE_WIFI_AP)))
18+
list(APPEND EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/WiFiDnssdImpl.cpp")
19+
endif()
20+
21+
if((NOT CONFIG_ENABLE_WIFI_STATION) AND (NOT CONFIG_ENABLE_WIFI_AP))
22+
list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/ConnectivityManagerImpl_WiFi.cpp"
23+
"${CMAKE_CURRENT_LIST_DIR}/NetworkCommissioningDriver.cpp"
24+
"${CMAKE_CURRENT_LIST_DIR}/route_hook/ESP32RouteHook.c"
25+
"${CMAKE_CURRENT_LIST_DIR}/route_hook/ESP32RouteTable.c")
26+
endif()
27+
28+
if(NOT CONFIG_ENABLE_ROUTE_HOOK)
29+
list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/route_hook/ESP32RouteHook.c"
30+
"${CMAKE_CURRENT_LIST_DIR}/route_hook/ESP32RouteTable.c")
31+
endif()
32+
33+
if ((CONFIG_BT_ENABLED) AND (CONFIG_ENABLE_CHIPOBLE))
34+
if (CONFIG_BT_NIMBLE_ENABLED)
35+
list(APPEND EXPLANT_SRC_DIRS_LIST "${CMAKE_CURRENT_LIST_DIR}/nimble")
36+
list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/bluedroid/BLEManagerImpl.cpp")
37+
if(NOT CONFIG_ENABLE_ESP32_BLE_CONTROLLER)
38+
list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/bluedroid/ChipDeviceScanner.cpp")
39+
endif()
40+
else()
41+
list(APPEND EXPLANT_SRC_DIRS_LIST "${CMAKE_CURRENT_LIST_DIR}/bluedroid")
42+
list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/nimble/BLEManagerImpl.cpp")
43+
if(NOT CONFIG_ENABLE_ESP32_BLE_CONTROLLER)
44+
list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/nimble/ChipDeviceScanner.cpp"
45+
"${CMAKE_CURRENT_LIST_DIR}/nimble/misc.c"
46+
"${CMAKE_CURRENT_LIST_DIR}/nimble/peer.c")
47+
endif()
48+
endif()
49+
endif()
50+
51+
if (NOT CONFIG_ENABLE_ETHERNET_TELEMETRY)
52+
list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/ConnectivityManagerImpl_Ethernet.cpp"
53+
"${CMAKE_CURRENT_LIST_DIR}/NetworkCommissioningDriver_Ethernet.cpp")
54+
endif()
55+
56+
if (NOT CONFIG_ENABLE_MATTER_OVER_THREAD)
57+
list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/OpenthreadLauncher.c"
58+
"${CMAKE_CURRENT_LIST_DIR}/ThreadStackManagerImpl.cpp")
59+
endif()
60+
61+
if (NOT CONFIG_ENABLE_OTA_REQUESTOR)
62+
list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/OTAImageProcessorImpl.cpp")
63+
endif()
64+
65+
66+
if (NOT CONFIG_ENABLE_ESP32_FACTORY_DATA_PROVIDER)
67+
list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/ESP32FactoryDataProvider.cpp")
68+
endif()
69+
70+
if (NOT CONFIG_ENABLE_ESP32_DEVICE_INFO_PROVIDER)
71+
list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/ESP32DeviceInfoProvider.cpp")
72+
endif()
73+
74+
if (NOT CONFIG_SEC_CERT_DAC_PROVIDER)
75+
list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/ESP32SecureCertDACProvider.cpp")
76+
endif()
77+
78+
if (NOT CONFIG_USE_ESP32_ECDSA_PERIPHERAL)
79+
list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/ESP32CHIPCryptoPAL.cpp")
80+
endif()

0 commit comments

Comments
 (0)