Skip to content

Commit 28dc66a

Browse files
committed
Merge branch 'example/blemesh_bridge_platform_update_v1.2' into 'release/v1.2'
blemesh_bridge: sync custom platform for blemesh_bridge(v1.2) See merge request app-frameworks/esp-matter!655
2 parents 0e10da9 + 8d2c271 commit 28dc66a

12 files changed

+620
-32
lines changed

examples/common/blemesh_platform/platform/ESP32_custom/BUILD.gn

+59-9
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,10 @@ static_library("ESP32_custom") {
114114
"${chip_root}/src/setup_payload",
115115
]
116116

117-
public = [ "${chip_root}/src/credentials/DeviceAttestationCredsProvider.h" ]
117+
public = [
118+
"${chip_root}/src/credentials/CHIPCert.h",
119+
"${chip_root}/src/credentials/DeviceAttestationCredsProvider.h",
120+
]
118121

119122
public_deps = [
120123
"${chip_root}/src/crypto",
@@ -136,19 +139,31 @@ static_library("ESP32_custom") {
136139
if (chip_enable_chipoble) {
137140
sources += [
138141
"BLEManagerImpl.h",
142+
"ChipDeviceScanner.h",
139143
]
140144
}
141145

146+
if (chip_enable_ble_controller) {
147+
sources += [ "ChipDeviceScanner.h" ]
148+
}
149+
142150
if (chip_bt_nimble_enabled) {
143-
sources += [
144-
"nimble/BLEManagerImpl.cpp",
145-
]
151+
sources += [ "nimble/BLEManagerImpl.cpp" ]
152+
if (chip_enable_ble_controller) {
153+
sources += [
154+
"nimble/ChipDeviceScanner.cpp",
155+
"nimble/blecent.h",
156+
"nimble/misc.c",
157+
"nimble/peer.c",
158+
]
159+
}
146160
}
147161

148162
if (chip_bt_bluedroid_enabled) {
149-
sources += [
150-
"bluedroid/BLEManagerImpl.cpp",
151-
]
163+
sources += [ "bluedroid/BLEManagerImpl.cpp" ]
164+
if (chip_enable_ble_controller) {
165+
sources += [ "bluedroid/ChipDeviceScanner.cpp" ]
166+
}
152167
}
153168

154169
if (chip_enable_wifi) {
@@ -173,15 +188,34 @@ static_library("ESP32_custom") {
173188
}
174189
}
175190

191+
if (chip_mdns == "platform") {
192+
sources += [ "DnssdImpl.cpp" ]
193+
}
194+
176195
if (chip_enable_ethernet) {
177196
sources += [
178197
"ConnectivityManagerImpl_Ethernet.cpp",
179198
"NetworkCommissioningDriver_Ethernet.cpp",
180199
]
181200
}
182201

183-
if (chip_mdns == "platform") {
184-
sources += [ "DnssdImpl.cpp" ]
202+
if (chip_enable_openthread) {
203+
sources += [
204+
"${chip_root}/src/platform/OpenThread/DnssdImpl.cpp",
205+
"${chip_root}/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.h",
206+
"${chip_root}/src/platform/OpenThread/OpenThreadUtils.cpp",
207+
"OpenthreadLauncher.c",
208+
"OpenthreadLauncher.h",
209+
"ThreadStackManagerImpl.cpp",
210+
"ThreadStackManagerImpl.h",
211+
]
212+
if (chip_mdns == "platform") {
213+
sources += [
214+
"${chip_root}/src/platform/OpenThread/OpenThreadDnssdImpl.cpp",
215+
"${chip_root}/src/platform/OpenThread/OpenThreadDnssdImpl.h",
216+
]
217+
}
218+
configs -= [ "${chip_root}/build/config/compiler:warnings_default" ]
185219
}
186220

187221
if (chip_use_factory_data_provider) {
@@ -197,4 +231,20 @@ static_library("ESP32_custom") {
197231
"ESP32DeviceInfoProvider.h",
198232
]
199233
}
234+
235+
if (chip_use_secure_cert_dac_provider) {
236+
sources += [
237+
"ESP32SecureCertDACProvider.cpp",
238+
"ESP32SecureCertDACProvider.h",
239+
]
240+
}
241+
242+
if (chip_use_esp32_ecdsa_peripheral) {
243+
sources += [
244+
"ESP32CHIPCryptoPAL.cpp",
245+
"ESP32CHIPCryptoPAL.h",
246+
]
247+
}
248+
249+
cflags = [ "-Wconversion" ]
200250
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../../connectedhomeip/connectedhomeip/src/platform/ESP32/ChipDeviceScanner.h
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../../connectedhomeip/connectedhomeip/src/platform/ESP32/DnssdImpl.h
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../../connectedhomeip/connectedhomeip/src/platform/ESP32/ESP32CHIPCryptoPAL.cpp
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../../connectedhomeip/connectedhomeip/src/platform/ESP32/ESP32CHIPCryptoPAL.h
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../../connectedhomeip/connectedhomeip/src/platform/ESP32/ESP32SecureCertDACProvider.cpp
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../../connectedhomeip/connectedhomeip/src/platform/ESP32/ESP32SecureCertDACProvider.h

0 commit comments

Comments
 (0)