Skip to content

Commit d52286c

Browse files
adigieadigie
committed
Move OnboardingCodesUtil out of server
* Move OnboardingCodesUtils to separate target. * Remove shell dependency on server Signed-off-by: Adrian Gielniewski <adrian.gielniewski@gmail.com>
1 parent a998bf6 commit d52286c

File tree

119 files changed

+136
-122
lines changed

Some content is hidden

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

119 files changed

+136
-122
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <air-purifier-manager.h>
3131
#include <app/clusters/identify-server/identify-server.h>
3232
#include <app/clusters/network-commissioning/network-commissioning.h>
33-
#include <app/server/OnboardingCodesUtil.h>
33+
#include <setup_payload/OnboardingCodesUtil.h>
3434
#include <app/util/endpoint-config-api.h>
3535
#include <data-model-providers/codegen/Instance.h>
3636
#include <lib/core/ErrorStr.h>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
#include <lib/support/CHIPPlatformMemory.h>
3939
#include <platform/CHIPDeviceLayer.h>
4040

41+
#include <setup_payload/OnboardingCodesUtil.h>
4142
#include <app/server/Dnssd.h>
42-
#include <app/server/OnboardingCodesUtil.h>
4343
#include <data-model-providers/codegen/Instance.h>
4444

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
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>
42+
#include <setup_payload/OnboardingCodesUtil.h>
4343
#include <app/server/Server.h>
4444
#include <app/util/attribute-storage.h>
4545
#include <assert.h>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
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>
34+
#include <setup_payload/OnboardingCodesUtil.h>
3535
#include <app/server/Server.h>
3636
#include <app/util/endpoint-config-api.h>
3737
#include <data-model-providers/codegen/Instance.h>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#include <app-common/zap-generated/attributes/Accessors.h>
3131
#include <app-common/zap-generated/ids/Clusters.h>
3232
#include <app/clusters/network-commissioning/network-commissioning.h>
33+
#include <setup_payload/OnboardingCodesUtil.h>
3334
#include <app/server/Dnssd.h>
34-
#include <app/server/OnboardingCodesUtil.h>
3535
#include <app/server/Server.h>
3636
#include <app/util/attribute-storage.h>
3737
#include <app/util/endpoint-config-api.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
@@ -32,8 +32,8 @@
3232
#include <vector>
3333

3434
#include <app-common/zap-generated/attributes/Accessors.h>
35+
#include <setup_payload/OnboardingCodesUtil.h>
3536
#include <app/server/Dnssd.h>
36-
#include <app/server/OnboardingCodesUtil.h>
3737
#include <app/server/Server.h>
3838

3939
#if CONFIG_HAVE_DISPLAY

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "nvs_flash.h"
3434
#include "platform/PlatformManager.h"
3535
#include "shell_extension/launch.h"
36-
#include <app/server/OnboardingCodesUtil.h>
36+
#include <setup_payload/OnboardingCodesUtil.h>
3737
#include <app/util/endpoint-config-api.h>
3838
#include <binding-handler.h>
3939
#include <common/CHIPDeviceManager.h>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
#include "LEDWidget.h"
2626
#include <app-common/zap-generated/attributes/Accessors.h>
2727
#include <app-common/zap-generated/ids/Clusters.h>
28+
#include <setup_payload/OnboardingCodesUtil.h>
2829
#include <app/server/Dnssd.h>
29-
#include <app/server/OnboardingCodesUtil.h>
3030
#include <app/server/Server.h>
3131
#include <app/util/attribute-storage.h>
3232
#include <app/util/endpoint-config-api.h>

‎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,7 +24,7 @@
2424

2525
#include <DeviceInfoProviderImpl.h>
2626

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

3030
#include <app/TestEventTriggerDelegate.h>

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

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

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

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
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>
30+
#include <setup_payload/OnboardingCodesUtil.h>
3131
#include <app/server/Server.h>
3232
#include <app/util/endpoint-config-api.h>
3333
#include <credentials/DeviceAttestationCredsProvider.h>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#include <app-common/zap-generated/attributes/Accessors.h>
3131
#include <app-common/zap-generated/ids/Clusters.h>
3232
#include <app/clusters/network-commissioning/network-commissioning.h>
33+
#include <setup_payload/OnboardingCodesUtil.h>
3334
#include <app/server/Dnssd.h>
34-
#include <app/server/OnboardingCodesUtil.h>
3535
#include <app/server/Server.h>
3636
#include <app/util/attribute-storage.h>
3737
#include <app/util/endpoint-config-api.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
@@ -38,8 +38,8 @@
3838

3939
#include <app-common/zap-generated/attributes/Accessors.h>
4040
#include <app/clusters/door-lock-server/door-lock-server.h>
41+
#include <setup_payload/OnboardingCodesUtil.h>
4142
#include <app/server/Dnssd.h>
42-
#include <app/server/OnboardingCodesUtil.h>
4343
#include <app/server/Server.h>
4444

4545
#if CONFIG_DEVICE_TYPE_M5STACK

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

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

38-
#include <app/server/OnboardingCodesUtil.h>
38+
#include <setup_payload/OnboardingCodesUtil.h>
3939
#include <app/util/endpoint-config-api.h>
4040
#include <binding-handler.h>
4141
#include <common/Esp32AppServer.h>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
#include "LEDWidget.h"
2626
#include <app-common/zap-generated/attributes/Accessors.h>
2727
#include <app-common/zap-generated/ids/Clusters.h>
28+
#include <setup_payload/OnboardingCodesUtil.h>
2829
#include <app/server/Dnssd.h>
29-
#include <app/server/OnboardingCodesUtil.h>
3030
#include <app/server/Server.h>
3131
#include <app/util/attribute-storage.h>
3232
#include <app/util/endpoint-config-api.h>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "LEDWidget.h"
2121
#include <DFUManager.h>
2222

23+
#include <setup_payload/OnboardingCodesUtil.h>
2324
#include <app/server/Dnssd.h>
24-
#include <app/server/OnboardingCodesUtil.h>
2525
#include <app/server/Server.h>
2626
#include <credentials/DeviceAttestationCredsProvider.h>
2727
#include <credentials/examples/DeviceAttestationCredsExample.h>

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

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

25-
#include <app/server/OnboardingCodesUtil.h>
25+
#include <setup_payload/OnboardingCodesUtil.h>
2626
#include <app/server/Server.h>
2727
#include <data-model-providers/codegen/Instance.h>
2828

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "init_Matter.h"
2525
#include "qrcodegen.h"
2626
#include <app/clusters/network-commissioning/network-commissioning.h>
27-
#include <app/server/OnboardingCodesUtil.h>
27+
#include <setup_payload/OnboardingCodesUtil.h>
2828
#include <app/util/attribute-storage.h>
2929
#include <app/util/endpoint-config-api.h>
3030
#include <assert.h>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#include <app/ConcreteAttributePath.h>
2525
#include <app/InteractionModelEngine.h>
2626
#include <app/clusters/identify-server/identify-server.h>
27+
#include <setup_payload/OnboardingCodesUtil.h>
2728
#include <app/reporting/reporting.h>
28-
#include <app/server/OnboardingCodesUtil.h>
2929
#include <app/util/attribute-storage.h>
3030
#include <app/util/endpoint-config-api.h>
3131
#include <assert.h>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#include <app/ConcreteAttributePath.h>
2525
#include <app/InteractionModelEngine.h>
2626
#include <app/clusters/identify-server/identify-server.h>
27+
#include <setup_payload/OnboardingCodesUtil.h>
2728
#include <app/reporting/reporting.h>
28-
#include <app/server/OnboardingCodesUtil.h>
2929
#include <app/util/attribute-storage.h>
3030
#include <assert.h>
3131
#include <lib/core/CHIPError.h>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#include <app/ConcreteAttributePath.h>
2525
#include <app/InteractionModelEngine.h>
2626
#include <app/clusters/identify-server/identify-server.h>
27+
#include <setup_payload/OnboardingCodesUtil.h>
2728
#include <app/reporting/reporting.h>
28-
#include <app/server/OnboardingCodesUtil.h>
2929
#include <app/util/attribute-storage.h>
3030
#include <assert.h>
3131
#include <lib/core/CHIPError.h>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include <app-common/zap-generated/ids/Clusters.h>
2424
#include <app/ConcreteAttributePath.h>
2525
#include <app/clusters/identify-server/identify-server.h>
26+
#include <setup_payload/OnboardingCodesUtil.h>
2627
#include <app/reporting/reporting.h>
27-
#include <app/server/OnboardingCodesUtil.h>
2828
#include <app/util/attribute-storage.h>
2929
#include <app/util/endpoint-config-api.h>
3030
#include <common/Esp32AppServer.h>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include <app/clusters/identify-server/identify-server.h>
3030
#include <app/clusters/network-commissioning/network-commissioning.h>
31-
#include <app/server/OnboardingCodesUtil.h>
31+
#include <setup_payload/OnboardingCodesUtil.h>
3232
#include <app/server/Server.h>
3333
#include <app/util/endpoint-config-api.h>
3434
#include <credentials/DeviceAttestationCredsProvider.h>

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

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

3232
#include <app/clusters/network-commissioning/network-commissioning.h>
33-
#include <app/server/OnboardingCodesUtil.h>
33+
#include <setup_payload/OnboardingCodesUtil.h>
3434
#include <app/server/Server.h>
3535
#include <data-model-providers/codegen/Instance.h>
3636

‎examples/chef/nrfconnect/main.cpp

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

28-
#include <app/server/OnboardingCodesUtil.h>
28+
#include <setup_payload/OnboardingCodesUtil.h>
2929
#include <app/server/Server.h>
3030
#include <data-model-providers/codegen/Instance.h>
3131

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

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

33-
#include <app/server/OnboardingCodesUtil.h>
33+
#include <setup_payload/OnboardingCodesUtil.h>
3434
#include <app/server/Server.h>
3535
#include <app/util/attribute-storage.h>
3636
#include <app/util/config.h>

‎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

‎examples/common/pigweed/rpc_services/Device.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#include <platform/CommissionableDataProvider.h>
2323

2424
#include "app/clusters/ota-requestor/OTARequestorInterface.h"
25+
#include "setup_payload/OnboardingCodesUtil.h"
2526
#include "app/server/CommissioningWindowManager.h"
26-
#include "app/server/OnboardingCodesUtil.h"
2727
#include "app/server/Server.h"
2828
#include "credentials/FabricTable.h"
2929
#include "device_service/device_service.rpc.pb.h"

‎examples/contact-sensor-app/bouffalolab/common/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include <app-common/zap-generated/attributes/Accessors.h>
2020

21+
#include <setup_payload/OnboardingCodesUtil.h>
2122
#include <app/server/Dnssd.h>
22-
#include <app/server/OnboardingCodesUtil.h>
2323
#include <app/server/Server.h>
2424
#include <credentials/DeviceAttestationCredsProvider.h>
2525
#include <credentials/examples/DeviceAttestationCredsExample.h>

‎examples/contact-sensor-app/nxp/k32w0/main/AppTask.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
*/
1919
#include "AppTask.h"
2020
#include "AppEvent.h"
21-
#include <app/server/OnboardingCodesUtil.h>
21+
#include <setup_payload/OnboardingCodesUtil.h>
2222
#include <app/server/Server.h>
2323
#include <data-model-providers/codegen/Instance.h>
2424
#include <lib/core/ErrorStr.h>
2525

2626
#include <DeviceInfoProviderImpl.h>
27-
#include <app/server/OnboardingCodesUtil.h>
27+
#include <setup_payload/OnboardingCodesUtil.h>
2828
#include <credentials/DeviceAttestationCredsProvider.h>
2929
#include <credentials/examples/DeviceAttestationCredsExample.h>
3030
#include <inet/EndPointStateOpenThread.h>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "CHIPDeviceManager.h"
2222
#include "DeviceCallbacks.h"
2323
#include "qrcodegen.h"
24-
#include <app/server/OnboardingCodesUtil.h>
24+
#include <setup_payload/OnboardingCodesUtil.h>
2525
#include <app/util/attribute-storage.h>
2626
#include <app/util/endpoint-config-api.h>
2727
#include <assert.h>

‎examples/dishwasher-app/silabs/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <app-common/zap-generated/attribute-type.h>
2323
#include <app-common/zap-generated/ids/Attributes.h>
24-
#include <app/server/OnboardingCodesUtil.h>
24+
#include <setup_payload/OnboardingCodesUtil.h>
2525
#include <app/server/Server.h>
2626
#include <app/util/attribute-storage.h>
2727
#include <lib/support/CodeUtils.h>

‎examples/energy-management-app/esp32/main/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
#include "shell_extension/launch.h"
3838
#include "shell_extension/openthread_cli_register.h"
3939
#include <EnergyManagementAppCmdLineOptions.h>
40+
#include <setup_payload/OnboardingCodesUtil.h>
4041
#include <app/server/Dnssd.h>
41-
#include <app/server/OnboardingCodesUtil.h>
4242
#include <app/util/endpoint-config-api.h>
4343
#include <credentials/DeviceAttestationCredsProvider.h>
4444
#include <credentials/examples/DeviceAttestationCredsExample.h>

‎examples/energy-management-app/silabs/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <app-common/zap-generated/ids/Clusters.h>
2929
#include <app/ConcreteAttributePath.h>
3030
#include <app/clusters/network-commissioning/network-commissioning.h>
31-
#include <app/server/OnboardingCodesUtil.h>
31+
#include <setup_payload/OnboardingCodesUtil.h>
3232
#include <app/server/Server.h>
3333
#include <app/util/attribute-storage.h>
3434
#include <app/util/endpoint-config-api.h>

‎examples/light-switch-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#include <app/clusters/identify-server/identify-server.h>
3131
#include <app/clusters/network-commissioning/network-commissioning.h>
32-
#include <app/server/OnboardingCodesUtil.h>
32+
#include <setup_payload/OnboardingCodesUtil.h>
3333
#include <app/server/Server.h>
3434
#include <app/util/endpoint-config-api.h>
3535
#include <data-model-providers/codegen/Instance.h>

‎examples/light-switch-app/asr/src/AppTask.cpp

100755100644
+1-1
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#include "lega_rtos_api.h"
3030
#include <app/clusters/identify-server/identify-server.h>
3131
#include <app/clusters/network-commissioning/network-commissioning.h>
32+
#include <setup_payload/OnboardingCodesUtil.h>
3233
#include <app/server/Dnssd.h>
33-
#include <app/server/OnboardingCodesUtil.h>
3434
#include <app/server/Server.h>
3535
#include <app/util/attribute-storage.h>
3636
#include <app/util/endpoint-config-api.h>

‎examples/light-switch-app/cc13x4_26x4/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
#include <app/clusters/identify-server/identify-server.h>
5151
#include <app/clusters/on-off-server/on-off-server.h>
5252
#include <app/clusters/switch-server/switch-server.h>
53-
#include <app/server/OnboardingCodesUtil.h>
53+
#include <setup_payload/OnboardingCodesUtil.h>
5454
#include <app/server/Server.h>
5555
#include <app/util/attribute-storage.h>
5656

‎examples/light-switch-app/esp32/main/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "nvs_flash.h"
3232
#include "shell_extension/launch.h"
3333

34-
#include <app/server/OnboardingCodesUtil.h>
34+
#include <setup_payload/OnboardingCodesUtil.h>
3535
#include <credentials/DeviceAttestationCredsProvider.h>
3636
#include <credentials/examples/DeviceAttestationCredsExample.h>
3737
#include <platform/ESP32/ESP32Utils.h>

0 commit comments

Comments
 (0)