Skip to content

Commit 1237088

Browse files
wqx6pull[bot]
authored andcommitted
OTA Requestor: Use common codes for ESP OTA-Requestor app & move OTA implements to platform path (#13017)
* use common codes of ota-requestor cluster in ESP OTA-Requestor app * move OTAImageProcessor and OTARequestorDriver Implement to /src/platform/ * Add OTA implements for darwin platform
1 parent b9f3243 commit 1237088

25 files changed

+411
-950
lines changed

config/esp32/components/chip/Kconfig

+6
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,12 @@ menu "CHIP Core"
149149
help
150150
The maximum number of simultaneously timers in the CHIP System Layer.
151151

152+
config ENABLE_OTA_REQUESTOR
153+
bool "Enable OTA Requestor"
154+
default n
155+
help
156+
Enable this option to enable OTA Requestor for example
157+
152158
endmenu # "System Options"
153159

154160
menu "Security Options"

examples/all-clusters-app/esp32/main/Kconfig.projbuild

-9
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,3 @@ depends on ENABLE_PW_RPC
140140
about available pin numbers for UART.
141141

142142
endmenu
143-
144-
menu "OTA Options"
145-
146-
config ENABLE_OTA_REQUESTOR
147-
bool "Enable OTA Requestor"
148-
default y
149-
help
150-
Enable this option to enable the OTA Requestor
151-
endmenu

examples/ota-requestor-app/esp32/main/BDXDownloader.cpp

-155
This file was deleted.

examples/ota-requestor-app/esp32/main/CMakeLists.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
1919
idf_component_register(PRIV_INCLUDE_DIRS
2020
"${CMAKE_CURRENT_LIST_DIR}/include"
21+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src"
2122
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/ota-requestor-app/"
22-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/ota-requestor-app/ota-requestor-common"
2323
SRC_DIRS
2424
"${CMAKE_CURRENT_LIST_DIR}"
2525
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/ota-requestor-app/zap-generated"
@@ -44,9 +44,7 @@ idf_component_register(PRIV_INCLUDE_DIRS
4444
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/general-commissioning-server"
4545
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/network-commissioning"
4646
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/operational-credentials-server"
47-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/ota-requestor-app/ota-requestor-common"
48-
EXCLUDE_SRCS
49-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/ota-requestor-app/ota-requestor-common/BDXDownloader.cpp"
47+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ota-requestor"
5048
PRIV_REQUIRES chip QRCode bt console app_update)
5149

5250
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14)

0 commit comments

Comments
 (0)