Skip to content

Commit 4e7a9d8

Browse files
adigiemaciejbaczmanski
adigie
authored and
maciejbaczmanski
committed
[nrf fromtree] Move OnboardingCodesUtil out of app/server (project-chip#37401)
* Move OnboardingCodesUtil out of server * Move OnboardingCodesUtils to separate target. * Remove shell dependency on server. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no> * [mw320] Remove shell dependency on app/server Use PlatformMgr directly. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no> * [NXP][examples] Add missing dependency Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no> * [linux][examples] Add missing dependency Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no> * [Infineon][examples] Add missing dependency Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no> --------- Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no> (cherry picked from commit b959364)
1 parent 820bf9d commit 4e7a9d8

File tree

130 files changed

+151
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+151
-125
lines changed

‎examples/air-purifier-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
#include <air-purifier-manager.h>
3030
#include <app/clusters/identify-server/identify-server.h>
3131
#include <app/clusters/network-commissioning/network-commissioning.h>
32-
#include <app/server/OnboardingCodesUtil.h>
3332
#include <app/util/endpoint-config-api.h>
3433
#include <lib/core/ErrorStr.h>
3534
#include <platform/Ameba/AmebaConfig.h>
3635
#include <platform/Ameba/NetworkCommissioningDriver.h>
3736
#include <platform/CHIPDeviceLayer.h>
3837
#include <setup_payload/ManualSetupPayloadGenerator.h>
38+
#include <setup_payload/OnboardingCodesUtil.h>
3939
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
4040
#if CONFIG_ENABLE_AMEBA_CRYPTO
4141
#include <platform/Ameba/crypto/AmebaPersistentStorageOperationalKeystore.h>

‎examples/air-purifier-app/cc32xx/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include <platform/CHIPDeviceLayer.h>
4040

4141
#include <app/server/Dnssd.h>
42-
#include <app/server/OnboardingCodesUtil.h>
42+
#include <setup_payload/OnboardingCodesUtil.h>
4343

4444
#include <ti/drivers/apps/Button.h>
4545
#include <ti/drivers/apps/LED.h>

‎examples/air-quality-sensor-app/silabs/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
#include <app-common/zap-generated/callback.h>
4040
#include <app-common/zap-generated/cluster-objects.h>
4141
#include <app-common/zap-generated/ids/Attributes.h>
42-
#include <app/server/OnboardingCodesUtil.h>
4342
#include <app/server/Server.h>
4443
#include <app/util/attribute-storage.h>
4544
#include <assert.h>
4645
#include <lib/support/CodeUtils.h>
4746
#include <platform/CHIPDeviceLayer.h>
4847
#include <platform/silabs/platformAbstraction/SilabsPlatform.h>
48+
#include <setup_payload/OnboardingCodesUtil.h>
4949
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
5050
#include <setup_payload/SetupPayload.h>
5151

‎examples/all-clusters-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131

3232
#include <app/clusters/identify-server/identify-server.h>
3333
#include <app/clusters/network-commissioning/network-commissioning.h>
34-
#include <app/server/OnboardingCodesUtil.h>
3534
#include <app/server/Server.h>
3635
#include <app/util/endpoint-config-api.h>
3736
#include <lib/core/ErrorStr.h>
37+
#include <setup_payload/OnboardingCodesUtil.h>
3838

3939
#include <platform/Ameba/AmebaConfig.h>
4040
#include <platform/Ameba/NetworkCommissioningDriver.h>

‎examples/all-clusters-app/asr/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include <app-common/zap-generated/ids/Clusters.h>
3232
#include <app/clusters/network-commissioning/network-commissioning.h>
3333
#include <app/server/Dnssd.h>
34-
#include <app/server/OnboardingCodesUtil.h>
3534
#include <app/server/Server.h>
3635
#include <app/util/attribute-storage.h>
3736
#include <app/util/endpoint-config-api.h>
@@ -40,6 +39,7 @@
4039
#include <platform/ASR/NetworkCommissioningDriver.h>
4140
#include <platform/CHIPDeviceLayer.h>
4241
#include <protocols/interaction_model/StatusCode.h>
42+
#include <setup_payload/OnboardingCodesUtil.h>
4343
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
4444
#include <setup_payload/SetupPayload.h>
4545
#include <static-supported-modes-manager.h>

‎examples/all-clusters-app/esp32/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "esp_idf_version.h"
2929
#include "esp_log.h"
3030
#include "freertos/FreeRTOS.h"
31-
#include <app/server/OnboardingCodesUtil.h>
31+
#include <setup_payload/OnboardingCodesUtil.h>
3232

3333
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
3434
#include "esp_spi_flash.h"

‎examples/all-clusters-app/esp32/main/include/DeviceWithDisplay.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333

3434
#include <app-common/zap-generated/attributes/Accessors.h>
3535
#include <app/server/Dnssd.h>
36-
#include <app/server/OnboardingCodesUtil.h>
3736
#include <app/server/Server.h>
37+
#include <setup_payload/OnboardingCodesUtil.h>
3838

3939
#if CONFIG_HAVE_DISPLAY
4040
#include "Display.h"

‎examples/all-clusters-app/esp32/main/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "nvs_flash.h"
3434
#include "platform/PlatformManager.h"
3535
#include "shell_extension/launch.h"
36-
#include <app/server/OnboardingCodesUtil.h>
3736
#include <app/util/endpoint-config-api.h>
3837
#include <binding-handler.h>
3938
#include <common/CHIPDeviceManager.h>
@@ -42,6 +41,7 @@
4241
#include <credentials/DeviceAttestationCredsProvider.h>
4342
#include <credentials/examples/DeviceAttestationCredsExample.h>
4443
#include <platform/ESP32/ESP32Utils.h>
44+
#include <setup_payload/OnboardingCodesUtil.h>
4545
#include <static-supported-modes-manager.h>
4646
#include <static-supported-temperature-levels.h>
4747

‎examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <app-common/zap-generated/attributes/Accessors.h>
2727
#include <app-common/zap-generated/ids/Clusters.h>
2828
#include <app/server/Dnssd.h>
29-
#include <app/server/OnboardingCodesUtil.h>
3029
#include <app/server/Server.h>
3130
#include <app/util/attribute-storage.h>
3231
#include <app/util/endpoint-config-api.h>
@@ -35,6 +34,7 @@
3534
#include <credentials/examples/DeviceAttestationCredsExample.h>
3635
#include <cy_wcm.h>
3736
#include <platform/CHIPDeviceLayer.h>
37+
#include <setup_payload/OnboardingCodesUtil.h>
3838
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
3939
#include <setup_payload/SetupPayload.h>
4040

‎examples/all-clusters-app/mbed/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "AppTask.h"
2020
#include "LEDWidget.h"
2121
#include <DFUManager.h>
22-
#include <app/server/OnboardingCodesUtil.h>
22+
#include <setup_payload/OnboardingCodesUtil.h>
2323

2424
#include <app/server/Dnssd.h>
2525
#include <app/server/Server.h>

‎examples/all-clusters-app/nrfconnect/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
#include <DeviceInfoProviderImpl.h>
2626

27-
#include <app/server/OnboardingCodesUtil.h>
2827
#include <app/server/Server.h>
28+
#include <setup_payload/OnboardingCodesUtil.h>
2929

3030
#include <app/TestEventTriggerDelegate.h>
3131
#include <app/clusters/identify-server/identify-server.h>

‎examples/all-clusters-app/nxp/mw320/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include <lib/shell/Engine.h>
2121

22-
#include <app/server/OnboardingCodesUtil.h>
2322
#include <platform/CHIPDeviceLayer.h>
23+
#include <setup_payload/OnboardingCodesUtil.h>
2424
#include <setup_payload/SetupPayload.h>
2525

2626
#include <lib/core/CHIPCore.h>

‎examples/all-clusters-app/nxp/rt/rw61x/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ rt_executable("all_cluster_app") {
176176
deps = [
177177
"${chip_root}/examples/${app_common_folder}",
178178
"${chip_root}/src/platform/logging:default",
179+
"${chip_root}/src/setup_payload:onboarding-codes-utils",
179180
]
180181

181182
sources += [

‎examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
#include <app/clusters/identify-server/identify-server.h>
2828
#include <app/clusters/network-commissioning/network-commissioning.h>
29-
#include <app/server/OnboardingCodesUtil.h>
3029
#include <app/server/Server.h>
3130
#include <app/util/endpoint-config-api.h>
3231
#include <credentials/DeviceAttestationCredsProvider.h>
@@ -36,6 +35,7 @@
3635
#include <platform/Ameba/NetworkCommissioningDriver.h>
3736
#include <platform/CHIPDeviceLayer.h>
3837
#include <setup_payload/ManualSetupPayloadGenerator.h>
38+
#include <setup_payload/OnboardingCodesUtil.h>
3939
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
4040
#include <static-supported-modes-manager.h>
4141
#include <support/CHIPMem.h>

‎examples/all-clusters-minimal-app/asr/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include <app-common/zap-generated/ids/Clusters.h>
3232
#include <app/clusters/network-commissioning/network-commissioning.h>
3333
#include <app/server/Dnssd.h>
34-
#include <app/server/OnboardingCodesUtil.h>
3534
#include <app/server/Server.h>
3635
#include <app/util/attribute-storage.h>
3736
#include <app/util/endpoint-config-api.h>
@@ -40,6 +39,7 @@
4039
#include <platform/ASR/NetworkCommissioningDriver.h>
4140
#include <platform/CHIPDeviceLayer.h>
4241
#include <queue.h>
42+
#include <setup_payload/OnboardingCodesUtil.h>
4343
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
4444
#include <setup_payload/SetupPayload.h>
4545
#include <static-supported-modes-manager.h>

‎examples/all-clusters-minimal-app/esp32/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "esp_idf_version.h"
2929
#include "esp_log.h"
3030
#include "freertos/FreeRTOS.h"
31-
#include <app/server/OnboardingCodesUtil.h>
31+
#include <setup_payload/OnboardingCodesUtil.h>
3232

3333
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
3434
#include "esp_spi_flash.h"

‎examples/all-clusters-minimal-app/esp32/main/include/DeviceWithDisplay.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
#include <app-common/zap-generated/attributes/Accessors.h>
4040
#include <app/clusters/door-lock-server/door-lock-server.h>
4141
#include <app/server/Dnssd.h>
42-
#include <app/server/OnboardingCodesUtil.h>
4342
#include <app/server/Server.h>
43+
#include <setup_payload/OnboardingCodesUtil.h>
4444

4545
#if CONFIG_DEVICE_TYPE_M5STACK
4646
#define BUTTON_1_GPIO_NUM ((gpio_num_t) 39) // Left button on M5Stack

‎examples/all-clusters-minimal-app/esp32/main/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
#include "shell_extension/launch.h"
3636
#include <common/CHIPDeviceManager.h>
3737

38-
#include <app/server/OnboardingCodesUtil.h>
3938
#include <app/util/endpoint-config-api.h>
4039
#include <binding-handler.h>
4140
#include <common/Esp32AppServer.h>
4241
#include <common/Esp32ThreadInit.h>
4342
#include <credentials/DeviceAttestationCredsProvider.h>
4443
#include <credentials/examples/DeviceAttestationCredsExample.h>
4544
#include <platform/ESP32/ESP32Utils.h>
45+
#include <setup_payload/OnboardingCodesUtil.h>
4646
#include <static-supported-modes-manager.h>
4747

4848
#if CONFIG_HAVE_DISPLAY

‎examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <app-common/zap-generated/attributes/Accessors.h>
2727
#include <app-common/zap-generated/ids/Clusters.h>
2828
#include <app/server/Dnssd.h>
29-
#include <app/server/OnboardingCodesUtil.h>
3029
#include <app/server/Server.h>
3130
#include <app/util/attribute-storage.h>
3231
#include <app/util/endpoint-config-api.h>
@@ -35,6 +34,7 @@
3534
#include <credentials/examples/DeviceAttestationCredsExample.h>
3635
#include <cy_wcm.h>
3736
#include <platform/CHIPDeviceLayer.h>
37+
#include <setup_payload/OnboardingCodesUtil.h>
3838
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
3939
#include <setup_payload/SetupPayload.h>
4040

‎examples/all-clusters-minimal-app/mbed/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
#include "AppTask.h"
2020
#include "LEDWidget.h"
2121
#include <DFUManager.h>
22-
#include <app/server/OnboardingCodesUtil.h>
2322

2423
#include <app/server/Dnssd.h>
2524
#include <app/server/Server.h>
2625
#include <credentials/DeviceAttestationCredsProvider.h>
2726
#include <credentials/examples/DeviceAttestationCredsExample.h>
27+
#include <setup_payload/OnboardingCodesUtil.h>
2828

2929
#include <lib/support/logging/CHIPLogging.h>
3030
#include <static-supported-modes-manager.h>

‎examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#include "LEDUtil.h"
2323
#include "binding-handler.h"
2424

25-
#include <app/server/OnboardingCodesUtil.h>
2625
#include <app/server/Server.h>
26+
#include <setup_payload/OnboardingCodesUtil.h>
2727

2828
#include <app/util/attribute-storage.h>
2929
#include <app/util/endpoint-config-api.h>

‎examples/bridge-app/asr/src/AppTask.cpp

100755100644
+1-1
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
#include "init_Matter.h"
2525
#include "qrcodegen.h"
2626
#include <app/clusters/network-commissioning/network-commissioning.h>
27-
#include <app/server/OnboardingCodesUtil.h>
2827
#include <app/util/attribute-storage.h>
2928
#include <app/util/endpoint-config-api.h>
3029
#include <assert.h>
3130
#include <platform/ASR/NetworkCommissioningDriver.h>
3231
#include <platform/CHIPDeviceLayer.h>
32+
#include <setup_payload/OnboardingCodesUtil.h>
3333
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
3434
#include <setup_payload/SetupPayload.h>
3535

‎examples/bridge-app/asr/subdevice/SubDeviceManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include <app/InteractionModelEngine.h>
2626
#include <app/clusters/identify-server/identify-server.h>
2727
#include <app/reporting/reporting.h>
28-
#include <app/server/OnboardingCodesUtil.h>
2928
#include <app/util/attribute-storage.h>
3029
#include <app/util/endpoint-config-api.h>
3130
#include <assert.h>
@@ -35,6 +34,7 @@
3534
#include <lib/support/CHIPMemString.h>
3635
#include <lib/support/ZclString.h>
3736
#include <platform/CHIPDeviceLayer.h>
37+
#include <setup_payload/OnboardingCodesUtil.h>
3838

3939
using namespace ::chip;
4040
using namespace ::chip::Credentials;

‎examples/bridge-app/asr/subdevice/SubDeviceManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include <app/InteractionModelEngine.h>
2626
#include <app/clusters/identify-server/identify-server.h>
2727
#include <app/reporting/reporting.h>
28-
#include <app/server/OnboardingCodesUtil.h>
2928
#include <app/util/attribute-storage.h>
3029
#include <assert.h>
3130
#include <lib/core/CHIPError.h>
@@ -34,6 +33,7 @@
3433
#include <lib/support/CHIPMemString.h>
3534
#include <lib/support/ZclString.h>
3635
#include <platform/CHIPDeviceLayer.h>
36+
#include <setup_payload/OnboardingCodesUtil.h>
3737

3838
using namespace ::chip;
3939
using namespace ::chip::Credentials;

‎examples/bridge-app/asr/subdevice/subdevice_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include <app/InteractionModelEngine.h>
2626
#include <app/clusters/identify-server/identify-server.h>
2727
#include <app/reporting/reporting.h>
28-
#include <app/server/OnboardingCodesUtil.h>
2928
#include <app/util/attribute-storage.h>
3029
#include <assert.h>
3130
#include <lib/core/CHIPError.h>
@@ -34,6 +33,7 @@
3433
#include <lib/support/CHIPMemString.h>
3534
#include <lib/support/ZclString.h>
3635
#include <platform/CHIPDeviceLayer.h>
36+
#include <setup_payload/OnboardingCodesUtil.h>
3737

3838
using namespace ::chip;
3939
using namespace ::chip::Credentials;

‎examples/bridge-app/esp32/main/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <app/ConcreteAttributePath.h>
2525
#include <app/clusters/identify-server/identify-server.h>
2626
#include <app/reporting/reporting.h>
27-
#include <app/server/OnboardingCodesUtil.h>
2827
#include <app/util/attribute-storage.h>
2928
#include <app/util/endpoint-config-api.h>
3029
#include <common/Esp32AppServer.h>
@@ -35,6 +34,7 @@
3534
#include <lib/support/CHIPMemString.h>
3635
#include <lib/support/ZclString.h>
3736
#include <platform/ESP32/ESP32Utils.h>
37+
#include <setup_payload/OnboardingCodesUtil.h>
3838

3939
#include <app/InteractionModelEngine.h>
4040
#include <app/server/Server.h>

‎examples/chef/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
#include <app/clusters/identify-server/identify-server.h>
2929
#include <app/clusters/network-commissioning/network-commissioning.h>
30-
#include <app/server/OnboardingCodesUtil.h>
3130
#include <app/server/Server.h>
3231
#include <app/util/endpoint-config-api.h>
3332
#include <credentials/DeviceAttestationCredsProvider.h>
@@ -38,6 +37,7 @@
3837
#include <platform/Ameba/NetworkCommissioningDriver.h>
3938
#include <platform/CHIPDeviceLayer.h>
4039
#include <setup_payload/ManualSetupPayloadGenerator.h>
40+
#include <setup_payload/OnboardingCodesUtil.h>
4141
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
4242
#include <support/CHIPMem.h>
4343

‎examples/chef/esp32/main/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#include <platform/CHIPDeviceLayer.h>
3131

3232
#include <app/clusters/network-commissioning/network-commissioning.h>
33-
#include <app/server/OnboardingCodesUtil.h>
3433
#include <app/server/Server.h>
34+
#include <setup_payload/OnboardingCodesUtil.h>
3535

3636
#include <credentials/DeviceAttestationCredsProvider.h>
3737
#include <credentials/examples/DeviceAttestationCredsExample.h>

‎examples/chef/nrfconnect/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
#include <lib/support/CHIPMem.h>
2626
#include <platform/CHIPDeviceLayer.h>
2727

28-
#include <app/server/OnboardingCodesUtil.h>
2928
#include <app/server/Server.h>
29+
#include <setup_payload/OnboardingCodesUtil.h>
3030

3131
#include <credentials/DeviceAttestationCredsProvider.h>
3232
#include <credentials/examples/DeviceAttestationCredsExample.h>

‎examples/chef/silabs/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
#endif // QR_CODE_ENABLED
3131
#endif // DISPLAY_ENABLED
3232

33-
#include <app/server/OnboardingCodesUtil.h>
3433
#include <app/server/Server.h>
3534
#include <app/util/attribute-storage.h>
3635
#include <app/util/config.h>
36+
#include <setup_payload/OnboardingCodesUtil.h>
3737

3838
#include <assert.h>
3939

‎examples/common/imgui_ui/windows/qrcode.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <imgui.h>
2121

2222
#include <Options.h> // examples/platform/linux/Options.h
23-
#include <app/server/OnboardingCodesUtil.h>
23+
#include <setup_payload/OnboardingCodesUtil.h>
2424
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
2525
#include <setup_payload/SetupPayload.h>
2626

0 commit comments

Comments
 (0)