[ota-requestor] Switch shell commands to use the common code

project-chip · Dec 9, 2021 · b96d504 · b96d504
1 parent 96f6d65
commit b96d504
Show file tree

Hide file tree

Showing 12 changed files with 322 additions and 786 deletions.
diff --git a/config/nrfconnect/chip-module/Kconfig b/config/nrfconnect/chip-module/Kconfig
@@ -34,3 +34,11 @@ config CHIP_OTA_REQUESTOR
 	imply DFU_TARGET
 	imply STREAM_FLASH
 	imply STREAM_FLASH_ERASE
+
+config CHIP_OTA_REQUESTOR_BUFFER_SIZE
+	int "OTA Requestor image buffer size"
+	default 1024
+	depends on CHIP_OTA_REQUESTOR
+	help
+	  Configures size of the buffer used by OTA Requestor when downloading and
+	  writing a new firmware image to flash.
diff --git a/src/app/zap_cluster_list.py b/src/app/zap_cluster_list.py
@@ -138,7 +138,7 @@
     'ON_OFF_SWITCH_CONFIG_CLUSTER': [],
     'OPERATIONAL_CREDENTIALS_CLUSTER': [],
     'OTA_BOOTLOAD_CLUSTER': [],
-    'OTA_PROVIDER_CLUSTER': [],
+    'OTA_PROVIDER_CLUSTER': ['ota-requestor'],
     'OTA_REQUESTOR_CLUSTER': [],
     'POLL_CONTROL_CLUSTER': [],
     'POWER_CONFIG_CLUSTER': [],

diff --git a/src/lib/shell/commands/BUILD.gn b/src/lib/shell/commands/BUILD.gn
@@ -53,17 +53,9 @@ source_set("commands") {
 
   if (chip_enable_ota_requestor && chip_device_platform != "none") {
     sources += [ "Ota.cpp" ]
-    configs += [ "${chip_root}/src/controller:config" ]
-
-    if (chip_device_platform == "nrfconnect") {
-      sources += [ "DFUManager_nrfconnect.h" ]
-    }
-    if (chip_device_platform == "esp32") {
-      sources += [
-        "DFUManager_esp32.h",
-        "OTAUpdater_esp32.h",
-      ]
-    }
+    public_deps += [ "${chip_root}/src/app/clusters/ota-requestor:headers" ]
+    # TODO: remove dependency of OTA shell on controller-clusters
+    include_dirs = [ "${chip_root}/zzz_generated/controller-clusters" ]
   }
 
   if (chip_device_platform != "none") {

diff --git a/src/lib/shell/commands/DFUManager_esp32.h b/src/lib/shell/commands/DFUManager_esp32.h
diff --git a/src/lib/shell/commands/DFUManager_nrfconnect.h b/src/lib/shell/commands/DFUManager_nrfconnect.h