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
project-chip · Mar 4, 2022 · 2efa28b · 2efa28b
1 parent da53281
commit 2efa28b
Show file tree

Hide file tree

Showing 25 changed files with 411 additions and 950 deletions.
diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
@@ -149,6 +149,12 @@ menu "CHIP Core"
             help
                 The maximum number of simultaneously timers in the CHIP System Layer.
 
+        config ENABLE_OTA_REQUESTOR
+            bool "Enable OTA Requestor"
+            default n
+            help
+                Enable this option to enable OTA Requestor for example
+
     endmenu # "System Options"
 
     menu "Security Options"

diff --git a/examples/all-clusters-app/esp32/main/Kconfig.projbuild b/examples/all-clusters-app/esp32/main/Kconfig.projbuild
@@ -140,12 +140,3 @@ depends on ENABLE_PW_RPC
             about available pin numbers for UART.
 
 endmenu
-
-menu "OTA Options"
-
-    config ENABLE_OTA_REQUESTOR
-        bool "Enable OTA Requestor"
-        default y
-        help
-            Enable this option to enable the OTA Requestor
-endmenu
diff --git a/examples/ota-requestor-app/esp32/main/BDXDownloader.cpp b/examples/ota-requestor-app/esp32/main/BDXDownloader.cpp
diff --git a/examples/ota-requestor-app/esp32/main/CMakeLists.txt b/examples/ota-requestor-app/esp32/main/CMakeLists.txt
@@ -18,8 +18,8 @@
 # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
 idf_component_register(PRIV_INCLUDE_DIRS 
                       "${CMAKE_CURRENT_LIST_DIR}/include"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/ota-requestor-app/"
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/ota-requestor-app/ota-requestor-common"
                       SRC_DIRS
                       "${CMAKE_CURRENT_LIST_DIR}"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/ota-requestor-app/zap-generated"
@@ -44,9 +44,7 @@ idf_component_register(PRIV_INCLUDE_DIRS
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/general-commissioning-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/network-commissioning"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/operational-credentials-server"
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/ota-requestor-app/ota-requestor-common"
-                      EXCLUDE_SRCS
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/ota-requestor-app/ota-requestor-common/BDXDownloader.cpp"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ota-requestor"
                       PRIV_REQUIRES chip QRCode bt console app_update)
 
 set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14)