Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OTA] Move OTARequestorDriver to clusters directory #15949

Merged
merged 1 commit into from
Mar 8, 2022
Merged

[OTA] Move OTARequestorDriver to clusters directory #15949

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion config/mbed/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -463,10 +463,11 @@ if (CONFIG_CHIP_OTA_REQUESTOR)
)

target_sources(${APP_TARGET} PRIVATE
${CHIP_ROOT}/examples/platform/mbed/ota/OTARequestorDriverImpl.cpp
${CHIP_ROOT}/src/app/clusters/ota-requestor/OTARequestor.cpp
${CHIP_ROOT}/src/app/clusters/ota-requestor/GenericOTARequestorDriver.cpp
${CHIP_ROOT}/src/app/clusters/ota-requestor/BDXDownloader.cpp
${CHIP_ROOT}/src/platform/mbed/OTAImageProcessorImpl.cpp
${CHIP_ROOT}/src/platform/mbed/OTARequestorDriverImpl.cpp
)

if (NOT ${APP_TARGET} MATCHES "shell")
2 changes: 1 addition & 1 deletion examples/all-clusters-app/ameba/chip_main.cmake
View file
Original file line number Diff line number Diff line change
@@ -118,6 +118,7 @@ list(
#OTARequestor
${chip_dir}/src/app/clusters/ota-requestor/BDXDownloader.cpp
${chip_dir}/src/app/clusters/ota-requestor/OTARequestor.cpp
${chip_dir}/src/app/clusters/ota-requestor/GenericOTARequestorDriver.cpp
${chip_dir}/src/app/clusters/ota-requestor/ota-requestor-server.cpp
)
endif (matter_enable_ota_requestor)
@@ -264,4 +265,3 @@ add_custom_command(
POST_BUILD
COMMAND cp lib${chip_main}.a ${CMAKE_CURRENT_SOURCE_DIR}/lib/application
)

8 changes: 4 additions & 4 deletions examples/all-clusters-app/ameba/main/chipinterface.cpp
View file
Original file line number Diff line number Diff line change
@@ -39,10 +39,10 @@
#include <support/CHIPMem.h>

#if CONFIG_ENABLE_OTA_REQUESTOR
#include "app/clusters/ota-requestor/BDXDownloader.h"
#include "app/clusters/ota-requestor/OTARequestor.h"
#include "platform/Ameba/AmebaOTAImageProcessor.h"
#include "platform/GenericOTARequestorDriver.h"
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <platform/Ameba/AmebaOTAImageProcessor.h>
#endif

#if CONFIG_ENABLE_PW_RPC
2 changes: 1 addition & 1 deletion examples/all-clusters-app/esp32/main/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -38,6 +38,7 @@

#include <app/clusters/network-commissioning/network-commissioning.h>
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <app/server/OnboardingCodesUtil.h>
#include <app/util/af.h>
@@ -46,7 +47,6 @@
#include <credentials/examples/DeviceAttestationCredsExample.h>
#include <platform/ESP32/NetworkCommissioningDriver.h>
#include <platform/ESP32/OTAImageProcessorImpl.h>
#include <platform/GenericOTARequestorDriver.h>

#if CONFIG_HAVE_DISPLAY
#include "DeviceWithDisplay.h"
1 change: 1 addition & 0 deletions examples/all-clusters-app/nrfconnect/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -73,6 +73,7 @@ target_sources(app PRIVATE
${GEN_DIR}/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp
${NRFCONNECT_COMMON}/util/LEDWidget.cpp
${CHIP_ROOT}/src/app/clusters/ota-requestor/OTARequestor.cpp
${CHIP_ROOT}/src/app/clusters/ota-requestor/GenericOTARequestorDriver.cpp
${CHIP_ROOT}/src/app/clusters/ota-requestor/BDXDownloader.cpp)


2 changes: 1 addition & 1 deletion examples/all-clusters-app/nrfconnect/main/include/AppTask.h
View file
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@

#if CONFIG_CHIP_OTA_REQUESTOR
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <platform/GenericOTARequestorDriver.h>
#include <platform/nrfconnect/OTAImageProcessorImpl.h>
#endif

1 change: 1 addition & 0 deletions examples/lighting-app/ameba/chip_main.cmake
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ list(
#OTARequestor
${chip_dir}/src/app/clusters/ota-requestor/BDXDownloader.cpp
${chip_dir}/src/app/clusters/ota-requestor/OTARequestor.cpp
${chip_dir}/src/app/clusters/ota-requestor/GenericOTARequestorDriver.cpp
${chip_dir}/src/app/clusters/ota-requestor/ota-requestor-server.cpp
)
endif (matter_enable_ota_requestor)
8 changes: 4 additions & 4 deletions examples/lighting-app/ameba/main/chipinterface.cpp
View file
Original file line number Diff line number Diff line change
@@ -42,10 +42,10 @@
#include <lwip_netconf.h>

#if CONFIG_ENABLE_OTA_REQUESTOR
#include "app/clusters/ota-requestor/BDXDownloader.h"
#include "app/clusters/ota-requestor/OTARequestor.h"
#include "platform/Ameba/AmebaOTAImageProcessor.h"
#include "platform/GenericOTARequestorDriver.h"
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <platform/Ameba/AmebaOTAImageProcessor.h>
#endif

using namespace ::chip;
2 changes: 1 addition & 1 deletion examples/lighting-app/esp32/main/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -28,14 +28,14 @@
#include "shell_extension/launch.h"
#include <app/clusters/network-commissioning/network-commissioning.h>
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <app/server/OnboardingCodesUtil.h>
#include <app/server/Server.h>
#include <credentials/DeviceAttestationCredsProvider.h>
#include <credentials/examples/DeviceAttestationCredsExample.h>
#include <platform/ESP32/NetworkCommissioningDriver.h>
#include <platform/ESP32/OTAImageProcessorImpl.h>
#include <platform/GenericOTARequestorDriver.h>

using namespace ::chip;
using namespace ::chip::Credentials;
1 change: 1 addition & 0 deletions examples/lighting-app/nrfconnect/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -94,6 +94,7 @@ target_sources(app PRIVATE
${NRFCONNECT_COMMON}/util/LEDWidget.cpp
${NRFCONNECT_COMMON}/util/ThreadUtil.cpp
${CHIP_ROOT}/src/app/clusters/ota-requestor/OTARequestor.cpp
${CHIP_ROOT}/src/app/clusters/ota-requestor/GenericOTARequestorDriver.cpp
${CHIP_ROOT}/src/app/clusters/ota-requestor/BDXDownloader.cpp)

chip_configure_data_model(app
2 changes: 1 addition & 1 deletion examples/lighting-app/nrfconnect/main/AppTask.cpp
View file
Original file line number Diff line number Diff line change
@@ -41,8 +41,8 @@

#if CONFIG_CHIP_OTA_REQUESTOR
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <platform/GenericOTARequestorDriver.h>
#include <platform/nrfconnect/OTAImageProcessorImpl.h>
#endif

6 changes: 3 additions & 3 deletions examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp
View file
Original file line number Diff line number Diff line change
@@ -36,9 +36,9 @@
/* OTA related includes */
#include "OTAImageProcessorImpl.h"
#include "OtaSupport.h"
#include "platform/GenericOTARequestorDriver.h"
#include "src/app/clusters/ota-requestor/BDXDownloader.h"
#include "src/app/clusters/ota-requestor/OTARequestor.h"
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>

#include "Keyboard.h"
#include "LED.h"
1 change: 1 addition & 0 deletions examples/lighting-app/telink/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -99,5 +99,6 @@ target_sources(app PRIVATE
${CHIP_ROOT}/src/app/clusters/ota-requestor/ota-requestor-server.cpp
${CHIP_ROOT}/src/app/clusters/ota-requestor/BDXDownloader.cpp
${CHIP_ROOT}/src/app/clusters/ota-requestor/OTARequestor.cpp
${CHIP_ROOT}/src/app/clusters/ota-requestor/GenericOTARequestorDriver.cpp
${CHIP_ROOT}/src/app/clusters/groups-server/groups-server.cpp
)
2 changes: 1 addition & 1 deletion examples/lock-app/cc13x2x7_26x2x7/main/AppTask.cpp
View file
Original file line number Diff line number Diff line change
@@ -30,10 +30,10 @@
#include <platform/CHIPDeviceLayer.h>

#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <lib/support/CHIPMem.h>
#include <lib/support/CHIPPlatformMemory.h>
#include <platform/GenericOTARequestorDriver.h>
#include <platform/cc13x2_26x2/OTAImageProcessorImpl.h>

#include <app/server/OnboardingCodesUtil.h>
2 changes: 1 addition & 1 deletion examples/lock-app/nrfconnect/main/AppTask.cpp
View file
Original file line number Diff line number Diff line change
@@ -37,8 +37,8 @@

#if CONFIG_CHIP_OTA_REQUESTOR
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <platform/GenericOTARequestorDriver.h>
#include <platform/nrfconnect/OTAImageProcessorImpl.h>
#endif

1 change: 1 addition & 0 deletions examples/ota-requestor-app/ameba/chip_main.cmake
View file
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@ list(

${chip_dir}/src/app/clusters/ota-requestor/BDXDownloader.cpp
${chip_dir}/src/app/clusters/ota-requestor/OTARequestor.cpp
${chip_dir}/src/app/clusters/ota-requestor/GenericOTARequestorDriver.cpp
${chip_dir}/src/app/clusters/ota-requestor/ota-requestor-server.cpp
)

8 changes: 4 additions & 4 deletions examples/ota-requestor-app/ameba/main/chipinterface.cpp
View file
Original file line number Diff line number Diff line change
@@ -32,10 +32,10 @@
#include <platform/CHIPDeviceLayer.h>
#include <support/CHIPMem.h>

#include "app/clusters/ota-requestor/BDXDownloader.h"
#include "app/clusters/ota-requestor/OTARequestor.h"
#include "platform/Ameba/AmebaOTAImageProcessor.h"
#include "platform/GenericOTARequestorDriver.h"
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <platform/Ameba/AmebaOTAImageProcessor.h>

void * __dso_handle = 0;

2 changes: 1 addition & 1 deletion examples/ota-requestor-app/cyw30739/src/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@
*/
#include <ChipShellCollection.h>
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <app/server/Server.h>
#include <credentials/examples/DeviceAttestationCredsExample.h>
@@ -26,7 +27,6 @@
#include <mbedtls/platform.h>
#include <platform/CHIPDeviceLayer.h>
#include <platform/CYW30739/OTAImageProcessorImpl.h>
#include <platform/GenericOTARequestorDriver.h>
#include <protocols/secure_channel/PASESession.h>
#include <sparcommon.h>
#include <stdio.h>
8 changes: 4 additions & 4 deletions examples/ota-requestor-app/efr32/src/AppTask.cpp
View file
Original file line number Diff line number Diff line change
@@ -32,10 +32,10 @@
#include <app/server/Server.h>
#include <app/util/attribute-storage.h>

#include "app/clusters/ota-requestor/BDXDownloader.h"
#include "app/clusters/ota-requestor/OTARequestor.h"
#include "platform/EFR32/OTAImageProcessorImpl.h"
#include "platform/GenericOTARequestorDriver.h"
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <platform/EFR32/OTAImageProcessorImpl.h>

#include <assert.h>

2 changes: 1 addition & 1 deletion examples/ota-requestor-app/esp32/main/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,7 @@
#include "nvs_flash.h"
#include <app/clusters/network-commissioning/network-commissioning.h>
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <app/server/Server.h>
#include <platform/ESP32/NetworkCommissioningDriver.h>
@@ -40,7 +41,6 @@
#include <lib/support/ErrorStr.h>

#include "OTAImageProcessorImpl.h"
#include "platform/GenericOTARequestorDriver.h"

using namespace ::chip;
using namespace ::chip::System;
10 changes: 5 additions & 5 deletions examples/ota-requestor-app/linux/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -17,11 +17,11 @@
*/

#include "AppMain.h"
#include "app/clusters/ota-requestor/BDXDownloader.h"
#include "app/clusters/ota-requestor/DefaultOTARequestorUserConsentProvider.h"
#include "app/clusters/ota-requestor/OTARequestor.h"
#include "platform/ExtendedOTARequestorDriver.h"
#include "platform/Linux/OTAImageProcessorImpl.h"
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/DefaultOTARequestorUserConsentProvider.h>
#include <app/clusters/ota-requestor/ExtendedOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <platform/Linux/OTAImageProcessorImpl.h>

using chip::BDXDownloader;
using chip::ByteSpan;
8 changes: 4 additions & 4 deletions examples/ota-requestor-app/p6/src/AppTask.cpp
View file
Original file line number Diff line number Diff line change
@@ -23,15 +23,14 @@
#include "AppEvent.h"
#include "ButtonHandler.h"
#include "LEDWidget.h"
#include "app/clusters/ota-requestor/BDXDownloader.h"
#include "app/clusters/ota-requestor/OTARequestor.h"
#include "platform/GenericOTARequestorDriver.h"
#include "platform/P6/OTAImageProcessorImpl.h"
#include "qrcodegen.h"
#include <app-common/zap-generated/attribute-id.h>
#include <app-common/zap-generated/attribute-type.h>
#include <app-common/zap-generated/attributes/Accessors.h>
#include <app-common/zap-generated/cluster-id.h>
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <app/server/Dnssd.h>
#include <app/server/OnboardingCodesUtil.h>
#include <app/server/Server.h>
@@ -41,6 +40,7 @@
#include <credentials/examples/DeviceAttestationCredsExample.h>
#include <cy_wcm.h>
#include <platform/CHIPDeviceLayer.h>
#include <platform/P6/OTAImageProcessorImpl.h>
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
#include <setup_payload/SetupPayload.h>

8 changes: 4 additions & 4 deletions examples/platform/efr32/OTAConfig.h
View file
Original file line number Diff line number Diff line change
@@ -18,10 +18,10 @@

#pragma once

#include "app/clusters/ota-requestor/BDXDownloader.h"
#include "app/clusters/ota-requestor/OTARequestor.h"
#include "platform/EFR32/OTAImageProcessorImpl.h"
#include "platform/GenericOTARequestorDriver.h"
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <platform/EFR32/OTAImageProcessorImpl.h>

class OTAConfig
{
0 src/platform/mbed/OTARequestorDriverImpl.cpp → ...tform/mbed/ota/OTARequestorDriverImpl.cpp
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions src/platform/mbed/OTARequestorDriverImpl.h → ...latform/mbed/ota/OTARequestorDriverImpl.h
View file
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@

#pragma once

#include <GenericOTARequestorDriver.h>
#include <OTARequestorDriver.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestorInterface.h>
#include <lib/core/CHIPCallback.h>
#include <lib/core/CHIPError.h>
2 changes: 1 addition & 1 deletion examples/platform/qpg/ota/ota.cpp
View file
Original file line number Diff line number Diff line change
@@ -28,8 +28,8 @@
#include <platform/CHIPDeviceLayer.h>

#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <platform/GenericOTARequestorDriver.h>
#include <platform/qpg/OTAImageProcessorImpl.h>

using namespace chip;
2 changes: 1 addition & 1 deletion examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp
View file
Original file line number Diff line number Diff line change
@@ -33,8 +33,8 @@

#if defined(CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR)
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <platform/GenericOTARequestorDriver.h>
#include <platform/cc13x2_26x2/OTAImageProcessorImpl.h>
#endif
#include <app-common/zap-generated/attributes/Accessors.h>
2 changes: 1 addition & 1 deletion examples/pump-app/nrfconnect/main/AppTask.cpp
View file
Original file line number Diff line number Diff line change
@@ -38,8 +38,8 @@

#if CONFIG_CHIP_OTA_REQUESTOR
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <platform/GenericOTARequestorDriver.h>
#include <platform/nrfconnect/OTAImageProcessorImpl.h>
#endif

2 changes: 1 addition & 1 deletion examples/pump-controller-app/nrfconnect/main/AppTask.cpp
View file
Original file line number Diff line number Diff line change
@@ -38,8 +38,8 @@

#if CONFIG_CHIP_OTA_REQUESTOR
#include <app/clusters/ota-requestor/BDXDownloader.h>
#include <app/clusters/ota-requestor/GenericOTARequestorDriver.h>
#include <app/clusters/ota-requestor/OTARequestor.h>
#include <platform/GenericOTARequestorDriver.h>
#include <platform/nrfconnect/OTAImageProcessorImpl.h>
#endif

2 changes: 2 additions & 0 deletions src/app/chip_data_model.gni
View file
Original file line number Diff line number Diff line change
@@ -132,6 +132,8 @@ template("chip_data_model") {
"${_app_root}/clusters/${cluster}/BDXDownloader.cpp",
"${_app_root}/clusters/${cluster}/BDXDownloader.h",
"${_app_root}/clusters/${cluster}/DefaultOTARequestorUserConsentProvider.h",
"${_app_root}/clusters/${cluster}/ExtendedOTARequestorDriver.cpp",
"${_app_root}/clusters/${cluster}/GenericOTARequestorDriver.cpp",
"${_app_root}/clusters/${cluster}/OTARequestor.cpp",
]
} else if (cluster == "bindings") {
4 changes: 2 additions & 2 deletions src/platform/ExtendedOTARequestorDriver.cpp → ...-requestor/ExtendedOTARequestorDriver.cpp
View file
Original file line number Diff line number Diff line change
@@ -15,8 +15,8 @@
* limitations under the License.
*/

#include <app/clusters/ota-requestor/OTARequestorInterface.h>
#include <platform/ExtendedOTARequestorDriver.h>
#include "ExtendedOTARequestorDriver.h"
#include "OTARequestorInterface.h"

namespace chip {
namespace DeviceLayer {
3 changes: 2 additions & 1 deletion src/platform/ExtendedOTARequestorDriver.h → ...ta-requestor/ExtendedOTARequestorDriver.h
View file
Original file line number Diff line number Diff line change
@@ -16,9 +16,10 @@
*/
#pragma once
#include <platform/CHIPDeviceLayer.h>
#include <platform/GenericOTARequestorDriver.h>
#include <platform/OTARequestorUserConsentDelegate.h>

#include "GenericOTARequestorDriver.h"

namespace chip {
namespace DeviceLayer {

Loading