From eb464f0df79d5dd86949caf26507b6c753730812 Mon Sep 17 00:00:00 2001 From: Adrian Gielniewski Date: Thu, 6 Feb 2025 20:50:33 +0100 Subject: [PATCH 1/5] Move OnboardingCodesUtil out of server * Move OnboardingCodesUtils to separate target. * Remove shell dependency on server. Signed-off-by: Adrian Gielniewski --- .../air-purifier-app/ameba/main/chipinterface.cpp | 2 +- examples/air-purifier-app/cc32xx/main/AppTask.cpp | 2 +- .../air-quality-sensor-app/silabs/src/AppTask.cpp | 2 +- .../all-clusters-app/ameba/main/chipinterface.cpp | 2 +- examples/all-clusters-app/asr/src/AppTask.cpp | 2 +- examples/all-clusters-app/esp32/main/AppTask.cpp | 2 +- .../esp32/main/include/DeviceWithDisplay.h | 2 +- examples/all-clusters-app/esp32/main/main.cpp | 2 +- .../all-clusters-app/infineon/psoc6/src/AppTask.cpp | 2 +- examples/all-clusters-app/mbed/main/AppTask.cpp | 2 +- .../all-clusters-app/nrfconnect/main/AppTask.cpp | 2 +- examples/all-clusters-app/nxp/mw320/main.cpp | 2 +- .../ameba/main/chipinterface.cpp | 2 +- .../all-clusters-minimal-app/asr/src/AppTask.cpp | 2 +- .../all-clusters-minimal-app/esp32/main/AppTask.cpp | 2 +- .../esp32/main/include/DeviceWithDisplay.h | 2 +- .../all-clusters-minimal-app/esp32/main/main.cpp | 2 +- .../infineon/psoc6/src/AppTask.cpp | 2 +- .../all-clusters-minimal-app/mbed/main/AppTask.cpp | 2 +- .../nrfconnect/main/AppTask.cpp | 2 +- examples/bridge-app/asr/src/AppTask.cpp | 2 +- .../bridge-app/asr/subdevice/SubDeviceManager.cpp | 2 +- .../bridge-app/asr/subdevice/SubDeviceManager.h | 2 +- .../bridge-app/asr/subdevice/subdevice_test.cpp | 2 +- examples/bridge-app/esp32/main/main.cpp | 2 +- examples/chef/ameba/main/chipinterface.cpp | 2 +- examples/chef/esp32/main/main.cpp | 2 +- examples/chef/nrfconnect/main.cpp | 2 +- examples/chef/silabs/src/AppTask.cpp | 2 +- examples/common/imgui_ui/windows/qrcode.cpp | 2 +- examples/common/pigweed/rpc_services/Device.h | 2 +- .../bouffalolab/common/AppTask.cpp | 2 +- .../contact-sensor-app/nxp/k32w0/main/AppTask.cpp | 3 +-- examples/dishwasher-app/asr/src/AppTask.cpp | 2 +- examples/dishwasher-app/silabs/src/AppTask.cpp | 2 +- examples/energy-management-app/esp32/main/main.cpp | 2 +- .../energy-management-app/silabs/src/AppTask.cpp | 2 +- .../light-switch-app/ameba/main/chipinterface.cpp | 2 +- examples/light-switch-app/asr/src/AppTask.cpp | 2 +- .../light-switch-app/cc13x4_26x4/src/AppTask.cpp | 2 +- examples/light-switch-app/esp32/main/main.cpp | 2 +- examples/light-switch-app/genio/src/AppTask.cpp | 2 +- .../light-switch-app/nrfconnect/main/AppTask.cpp | 2 +- examples/light-switch-app/qpg/src/AppTask.cpp | 2 +- examples/light-switch-app/silabs/src/AppTask.cpp | 2 +- examples/lighting-app/ameba/main/chipinterface.cpp | 2 +- examples/lighting-app/asr/src/AppTask.cpp | 2 +- examples/lighting-app/beken/main/chipinterface.cpp | 2 +- .../lighting-app/bouffalolab/common/AppTask.cpp | 2 +- examples/lighting-app/cc13x4_26x4/src/AppTask.cpp | 2 +- .../lighting-app/esp32/main/DeviceWithDisplay.h | 2 +- examples/lighting-app/esp32/main/main.cpp | 2 +- examples/lighting-app/genio/src/AppTask.cpp | 2 +- .../lighting-app/infineon/psoc6/src/AppTask.cpp | 2 +- examples/lighting-app/mbed/main/AppTask.cpp | 2 +- examples/lighting-app/nrfconnect/main/AppTask.cpp | 2 +- examples/lighting-app/nxp/k32w0/main/AppTask.cpp | 3 +-- examples/lighting-app/qpg/src/AppTask.cpp | 2 +- examples/lighting-app/silabs/src/AppTask.cpp | 2 +- .../lighting-app/stm32/src/STM32WB5/AppTask.cpp | 2 +- examples/lit-icd-app/nrfconnect/main/AppTask.cpp | 2 +- examples/lit-icd-app/silabs/src/AppTask.cpp | 2 +- examples/lock-app/asr/src/AppTask.cpp | 2 +- examples/lock-app/cc13x4_26x4/src/AppTask.cpp | 2 +- examples/lock-app/cc32xx/main/AppTask.cpp | 2 +- examples/lock-app/esp32/main/AppTask.cpp | 2 +- examples/lock-app/genio/src/AppTask.cpp | 2 +- examples/lock-app/infineon/psoc6/src/AppTask.cpp | 2 +- examples/lock-app/mbed/main/AppTask.cpp | 2 +- examples/lock-app/nrfconnect/main/AppTask.cpp | 2 +- examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp | 3 +-- examples/lock-app/qpg/src/AppTask.cpp | 2 +- examples/lock-app/silabs/src/AppTask.cpp | 2 +- examples/ota-provider-app/esp32/main/main.cpp | 2 +- examples/ota-requestor-app/asr/src/AppTask.cpp | 2 +- examples/ota-requestor-app/esp32/main/main.cpp | 2 +- examples/ota-requestor-app/genio/src/AppTask.cpp | 2 +- examples/ota-requestor-app/mbed/main/AppTask.cpp | 2 +- examples/platform/asr/init_Matter.cpp | 2 +- examples/platform/asr/shell/matter_shell.cpp | 2 +- .../platform/bouffalolab/common/plat/platform.cpp | 2 +- .../platform/infineon/cyw30739/matter_config.cpp | 2 +- examples/platform/linux/AppMain.cpp | 2 +- examples/platform/linux/CommissionerMain.cpp | 2 +- examples/platform/linux/Options.cpp | 2 +- .../nxp/common/app_task/source/AppTaskBase.cpp | 2 +- examples/platform/nxp/se05x/linux/AppMain.cpp | 2 +- .../platform/openiotsdk/app/openiotsdk_platform.cpp | 2 +- examples/platform/silabs/BaseApplication.cpp | 2 +- .../platform/telink/common/src/AppTaskCommon.cpp | 2 +- examples/pump-app/cc13x4_26x4/main/AppTask.cpp | 2 +- examples/pump-app/nrfconnect/main/AppTask.cpp | 2 +- examples/pump-app/silabs/src/AppTask.cpp | 2 +- .../cc13x4_26x4/main/AppTask.cpp | 2 +- .../pump-controller-app/nrfconnect/main/AppTask.cpp | 2 +- examples/refrigerator-app/asr/src/AppTask.cpp | 2 +- examples/refrigerator-app/silabs/src/AppTask.cpp | 2 +- examples/shell/cc13x4_26x4/main/AppTask.cpp | 3 +-- examples/smoke-co-alarm-app/silabs/src/AppTask.cpp | 2 +- .../temperature-measurement-app/asr/src/AppTask.cpp | 2 +- examples/thermostat/asr/src/AppTask.cpp | 2 +- examples/thermostat/genio/src/AppTask.cpp | 2 +- examples/thermostat/qpg/src/AppTask.cpp | 2 +- examples/thermostat/silabs/src/AppTask.cpp | 2 +- examples/thread-br-app/esp32/main/main.cpp | 2 +- examples/window-app/nrfconnect/main/AppTask.cpp | 2 +- examples/window-app/silabs/src/AppTask.cpp | 2 +- examples/window-app/silabs/src/WindowManager.cpp | 2 +- src/app/chip_data_model.cmake | 1 - src/app/server/BUILD.gn | 3 --- src/app/server/java/AndroidAppServerWrapper.cpp | 2 +- src/controller/python/chip/server/ServerInit.cpp | 2 +- src/lib/BUILD.gn | 1 + src/lib/shell/commands/BUILD.gn | 2 +- src/lib/shell/commands/NFC.cpp | 2 +- src/lib/shell/commands/OnboardingCodes.cpp | 2 +- src/setup_payload/BUILD.gn | 13 +++++++++++++ .../OnboardingCodesUtil.cpp | 2 +- .../server => setup_payload}/OnboardingCodesUtil.h | 0 119 files changed, 128 insertions(+), 122 deletions(-) mode change 100755 => 100644 examples/bridge-app/asr/src/AppTask.cpp mode change 100755 => 100644 examples/light-switch-app/asr/src/AppTask.cpp mode change 100755 => 100644 examples/lighting-app/asr/src/AppTask.cpp mode change 100755 => 100644 examples/ota-requestor-app/asr/src/AppTask.cpp mode change 100755 => 100644 examples/temperature-measurement-app/asr/src/AppTask.cpp mode change 100755 => 100644 examples/thermostat/asr/src/AppTask.cpp rename src/{app/server => setup_payload}/OnboardingCodesUtil.cpp (99%) rename src/{app/server => setup_payload}/OnboardingCodesUtil.h (100%) diff --git a/examples/air-purifier-app/ameba/main/chipinterface.cpp b/examples/air-purifier-app/ameba/main/chipinterface.cpp index 766197dec366ae..e44d8ee8a2ebad 100644 --- a/examples/air-purifier-app/ameba/main/chipinterface.cpp +++ b/examples/air-purifier-app/ameba/main/chipinterface.cpp @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -38,6 +37,7 @@ #include #include #include +#include #include #if CONFIG_ENABLE_AMEBA_CRYPTO #include diff --git a/examples/air-purifier-app/cc32xx/main/AppTask.cpp b/examples/air-purifier-app/cc32xx/main/AppTask.cpp index b604271d5f87b8..a65387b957bf65 100644 --- a/examples/air-purifier-app/cc32xx/main/AppTask.cpp +++ b/examples/air-purifier-app/cc32xx/main/AppTask.cpp @@ -39,8 +39,8 @@ #include #include -#include #include +#include #include #include diff --git a/examples/air-quality-sensor-app/silabs/src/AppTask.cpp b/examples/air-quality-sensor-app/silabs/src/AppTask.cpp index 572ec66dd5dd34..facbcf3de5a458 100644 --- a/examples/air-quality-sensor-app/silabs/src/AppTask.cpp +++ b/examples/air-quality-sensor-app/silabs/src/AppTask.cpp @@ -39,13 +39,13 @@ #include #include #include -#include #include #include #include #include #include #include +#include #include #include diff --git a/examples/all-clusters-app/ameba/main/chipinterface.cpp b/examples/all-clusters-app/ameba/main/chipinterface.cpp index 80a98b9c3d4c69..c4fbe0150572a9 100644 --- a/examples/all-clusters-app/ameba/main/chipinterface.cpp +++ b/examples/all-clusters-app/ameba/main/chipinterface.cpp @@ -31,11 +31,11 @@ #include #include -#include #include #include #include #include +#include #include #include diff --git a/examples/all-clusters-app/asr/src/AppTask.cpp b/examples/all-clusters-app/asr/src/AppTask.cpp index ef3c86d2720436..bf9b5b362973fb 100644 --- a/examples/all-clusters-app/asr/src/AppTask.cpp +++ b/examples/all-clusters-app/asr/src/AppTask.cpp @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -40,6 +39,7 @@ #include #include #include +#include #include #include #include diff --git a/examples/all-clusters-app/esp32/main/AppTask.cpp b/examples/all-clusters-app/esp32/main/AppTask.cpp index 2b7e7d89b921fc..1ead5ed7bee18d 100644 --- a/examples/all-clusters-app/esp32/main/AppTask.cpp +++ b/examples/all-clusters-app/esp32/main/AppTask.cpp @@ -28,7 +28,7 @@ #include "esp_idf_version.h" #include "esp_log.h" #include "freertos/FreeRTOS.h" -#include +#include #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0) #include "esp_spi_flash.h" diff --git a/examples/all-clusters-app/esp32/main/include/DeviceWithDisplay.h b/examples/all-clusters-app/esp32/main/include/DeviceWithDisplay.h index 916d1c44496078..3d28c6c38102ea 100644 --- a/examples/all-clusters-app/esp32/main/include/DeviceWithDisplay.h +++ b/examples/all-clusters-app/esp32/main/include/DeviceWithDisplay.h @@ -33,8 +33,8 @@ #include #include -#include #include +#include #if CONFIG_HAVE_DISPLAY #include "Display.h" diff --git a/examples/all-clusters-app/esp32/main/main.cpp b/examples/all-clusters-app/esp32/main/main.cpp index 7ef84346e6cf7d..7c96990865556d 100644 --- a/examples/all-clusters-app/esp32/main/main.cpp +++ b/examples/all-clusters-app/esp32/main/main.cpp @@ -33,7 +33,6 @@ #include "nvs_flash.h" #include "platform/PlatformManager.h" #include "shell_extension/launch.h" -#include #include #include #include @@ -42,6 +41,7 @@ #include #include #include +#include #include #include diff --git a/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp b/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp index 5c416f847d3293..f763b5442c574f 100644 --- a/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp +++ b/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -36,6 +35,7 @@ #include #include #include +#include #include #include diff --git a/examples/all-clusters-app/mbed/main/AppTask.cpp b/examples/all-clusters-app/mbed/main/AppTask.cpp index 3a6686b517a78a..7228a77cf36ba0 100644 --- a/examples/all-clusters-app/mbed/main/AppTask.cpp +++ b/examples/all-clusters-app/mbed/main/AppTask.cpp @@ -19,7 +19,7 @@ #include "AppTask.h" #include "LEDWidget.h" #include -#include +#include #include #include diff --git a/examples/all-clusters-app/nrfconnect/main/AppTask.cpp b/examples/all-clusters-app/nrfconnect/main/AppTask.cpp index f0f096ffcc398c..8ac7e36f479100 100644 --- a/examples/all-clusters-app/nrfconnect/main/AppTask.cpp +++ b/examples/all-clusters-app/nrfconnect/main/AppTask.cpp @@ -24,8 +24,8 @@ #include -#include #include +#include #include #include diff --git a/examples/all-clusters-app/nxp/mw320/main.cpp b/examples/all-clusters-app/nxp/mw320/main.cpp index a828706b0fa67f..fb032b950d41dc 100644 --- a/examples/all-clusters-app/nxp/mw320/main.cpp +++ b/examples/all-clusters-app/nxp/mw320/main.cpp @@ -19,8 +19,8 @@ #include -#include #include +#include #include #include diff --git a/examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp b/examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp index 8f18742ca5b42d..f3c09292c7b61a 100644 --- a/examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp +++ b/examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp @@ -27,7 +27,6 @@ #include #include -#include #include #include #include @@ -38,6 +37,7 @@ #include #include #include +#include #include #include #include diff --git a/examples/all-clusters-minimal-app/asr/src/AppTask.cpp b/examples/all-clusters-minimal-app/asr/src/AppTask.cpp index 7e33211b8a978b..b9cf8ca47e8b3d 100644 --- a/examples/all-clusters-minimal-app/asr/src/AppTask.cpp +++ b/examples/all-clusters-minimal-app/asr/src/AppTask.cpp @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -40,6 +39,7 @@ #include #include #include +#include #include #include #include diff --git a/examples/all-clusters-minimal-app/esp32/main/AppTask.cpp b/examples/all-clusters-minimal-app/esp32/main/AppTask.cpp index 89394e65c2560b..8f75430a068641 100644 --- a/examples/all-clusters-minimal-app/esp32/main/AppTask.cpp +++ b/examples/all-clusters-minimal-app/esp32/main/AppTask.cpp @@ -28,7 +28,7 @@ #include "esp_idf_version.h" #include "esp_log.h" #include "freertos/FreeRTOS.h" -#include +#include #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0) #include "esp_spi_flash.h" diff --git a/examples/all-clusters-minimal-app/esp32/main/include/DeviceWithDisplay.h b/examples/all-clusters-minimal-app/esp32/main/include/DeviceWithDisplay.h index b9f89e15ee8792..b5340b26aee6cb 100644 --- a/examples/all-clusters-minimal-app/esp32/main/include/DeviceWithDisplay.h +++ b/examples/all-clusters-minimal-app/esp32/main/include/DeviceWithDisplay.h @@ -39,8 +39,8 @@ #include #include #include -#include #include +#include #if CONFIG_DEVICE_TYPE_M5STACK #define BUTTON_1_GPIO_NUM ((gpio_num_t) 39) // Left button on M5Stack diff --git a/examples/all-clusters-minimal-app/esp32/main/main.cpp b/examples/all-clusters-minimal-app/esp32/main/main.cpp index 6066b21032f6e8..cdf645c71f5295 100644 --- a/examples/all-clusters-minimal-app/esp32/main/main.cpp +++ b/examples/all-clusters-minimal-app/esp32/main/main.cpp @@ -35,7 +35,6 @@ #include "shell_extension/launch.h" #include -#include #include #include #include @@ -43,6 +42,7 @@ #include #include #include +#include #include #if CONFIG_HAVE_DISPLAY diff --git a/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp b/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp index 1c0008b63bb7cb..f1f774a0e00743 100644 --- a/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp +++ b/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -36,6 +35,7 @@ #include #include #include +#include #include #include diff --git a/examples/all-clusters-minimal-app/mbed/main/AppTask.cpp b/examples/all-clusters-minimal-app/mbed/main/AppTask.cpp index 81f5f15a59c1e6..d5c37693be5f86 100644 --- a/examples/all-clusters-minimal-app/mbed/main/AppTask.cpp +++ b/examples/all-clusters-minimal-app/mbed/main/AppTask.cpp @@ -21,11 +21,11 @@ #include #include -#include #include #include #include #include +#include #include #include diff --git a/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp b/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp index 64331a3200c9c5..90b8b2ed45e02d 100644 --- a/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp +++ b/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp @@ -22,9 +22,9 @@ #include "LEDUtil.h" #include "binding-handler.h" -#include #include #include +#include #include #include diff --git a/examples/bridge-app/asr/src/AppTask.cpp b/examples/bridge-app/asr/src/AppTask.cpp old mode 100755 new mode 100644 index ea95500d402f07..e792deb629eaf8 --- a/examples/bridge-app/asr/src/AppTask.cpp +++ b/examples/bridge-app/asr/src/AppTask.cpp @@ -24,12 +24,12 @@ #include "init_Matter.h" #include "qrcodegen.h" #include -#include #include #include #include #include #include +#include #include #include diff --git a/examples/bridge-app/asr/subdevice/SubDeviceManager.cpp b/examples/bridge-app/asr/subdevice/SubDeviceManager.cpp index 776c4e43490e04..c0d45c06295c9d 100644 --- a/examples/bridge-app/asr/subdevice/SubDeviceManager.cpp +++ b/examples/bridge-app/asr/subdevice/SubDeviceManager.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -35,6 +34,7 @@ #include #include #include +#include using namespace ::chip; using namespace ::chip::Credentials; diff --git a/examples/bridge-app/asr/subdevice/SubDeviceManager.h b/examples/bridge-app/asr/subdevice/SubDeviceManager.h index 29ce5067fe7faf..deef8f7f80abff 100644 --- a/examples/bridge-app/asr/subdevice/SubDeviceManager.h +++ b/examples/bridge-app/asr/subdevice/SubDeviceManager.h @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -34,6 +33,7 @@ #include #include #include +#include using namespace ::chip; using namespace ::chip::Credentials; diff --git a/examples/bridge-app/asr/subdevice/subdevice_test.cpp b/examples/bridge-app/asr/subdevice/subdevice_test.cpp index ea2411d4ba897e..ad1752557663bb 100644 --- a/examples/bridge-app/asr/subdevice/subdevice_test.cpp +++ b/examples/bridge-app/asr/subdevice/subdevice_test.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -34,6 +33,7 @@ #include #include #include +#include using namespace ::chip; using namespace ::chip::Credentials; diff --git a/examples/bridge-app/esp32/main/main.cpp b/examples/bridge-app/esp32/main/main.cpp index d1075385cec8c9..2cc68ef559f260 100644 --- a/examples/bridge-app/esp32/main/main.cpp +++ b/examples/bridge-app/esp32/main/main.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -35,6 +34,7 @@ #include #include #include +#include #include #include diff --git a/examples/chef/ameba/main/chipinterface.cpp b/examples/chef/ameba/main/chipinterface.cpp index 52aed5ff4d39a9..01acf92062d6fc 100644 --- a/examples/chef/ameba/main/chipinterface.cpp +++ b/examples/chef/ameba/main/chipinterface.cpp @@ -28,7 +28,6 @@ #include #include -#include #include #include #include @@ -40,6 +39,7 @@ #include #include #include +#include #include #include diff --git a/examples/chef/esp32/main/main.cpp b/examples/chef/esp32/main/main.cpp index 0abd996d4182a4..1accdcdcae100a 100644 --- a/examples/chef/esp32/main/main.cpp +++ b/examples/chef/esp32/main/main.cpp @@ -30,9 +30,9 @@ #include #include -#include #include #include +#include #include #include diff --git a/examples/chef/nrfconnect/main.cpp b/examples/chef/nrfconnect/main.cpp index 14068cf37eed83..5ab73426d94379 100644 --- a/examples/chef/nrfconnect/main.cpp +++ b/examples/chef/nrfconnect/main.cpp @@ -25,9 +25,9 @@ #include #include -#include #include #include +#include #include #include diff --git a/examples/chef/silabs/src/AppTask.cpp b/examples/chef/silabs/src/AppTask.cpp index aed343e1b3750f..c9066ea121c83b 100644 --- a/examples/chef/silabs/src/AppTask.cpp +++ b/examples/chef/silabs/src/AppTask.cpp @@ -30,10 +30,10 @@ #endif // QR_CODE_ENABLED #endif // DISPLAY_ENABLED -#include #include #include #include +#include #include diff --git a/examples/common/imgui_ui/windows/qrcode.cpp b/examples/common/imgui_ui/windows/qrcode.cpp index 163110ed254769..bdf08897a3dc76 100644 --- a/examples/common/imgui_ui/windows/qrcode.cpp +++ b/examples/common/imgui_ui/windows/qrcode.cpp @@ -20,7 +20,7 @@ #include #include // examples/platform/linux/Options.h -#include +#include #include #include diff --git a/examples/common/pigweed/rpc_services/Device.h b/examples/common/pigweed/rpc_services/Device.h index 162cc6cd82ce64..0b2f38bc5dfd99 100644 --- a/examples/common/pigweed/rpc_services/Device.h +++ b/examples/common/pigweed/rpc_services/Device.h @@ -23,7 +23,6 @@ #include "app/clusters/ota-requestor/OTARequestorInterface.h" #include "app/server/CommissioningWindowManager.h" -#include "app/server/OnboardingCodesUtil.h" #include "app/server/Server.h" #include "credentials/FabricTable.h" #include "device_service/device_service.rpc.pb.h" @@ -31,6 +30,7 @@ #include "platform/ConfigurationManager.h" #include "platform/DiagnosticDataProvider.h" #include "platform/PlatformManager.h" +#include "setup_payload/OnboardingCodesUtil.h" #include #include #include diff --git a/examples/contact-sensor-app/bouffalolab/common/AppTask.cpp b/examples/contact-sensor-app/bouffalolab/common/AppTask.cpp index 5990e4201e6d07..3acb94cd6aaf7a 100644 --- a/examples/contact-sensor-app/bouffalolab/common/AppTask.cpp +++ b/examples/contact-sensor-app/bouffalolab/common/AppTask.cpp @@ -19,11 +19,11 @@ #include #include -#include #include #include #include #include +#include #include #if HEAP_MONITORING diff --git a/examples/contact-sensor-app/nxp/k32w0/main/AppTask.cpp b/examples/contact-sensor-app/nxp/k32w0/main/AppTask.cpp index 9ac0c918159fa9..ffeb434c6ec6cc 100644 --- a/examples/contact-sensor-app/nxp/k32w0/main/AppTask.cpp +++ b/examples/contact-sensor-app/nxp/k32w0/main/AppTask.cpp @@ -18,19 +18,18 @@ */ #include "AppTask.h" #include "AppEvent.h" -#include #include #include #include #include -#include #include #include #include #include #include #include +#include #include #include diff --git a/examples/dishwasher-app/asr/src/AppTask.cpp b/examples/dishwasher-app/asr/src/AppTask.cpp index 8c038cfe3674e9..aea885b3b2d001 100644 --- a/examples/dishwasher-app/asr/src/AppTask.cpp +++ b/examples/dishwasher-app/asr/src/AppTask.cpp @@ -21,11 +21,11 @@ #include "CHIPDeviceManager.h" #include "DeviceCallbacks.h" #include "qrcodegen.h" -#include #include #include #include #include +#include #include #include diff --git a/examples/dishwasher-app/silabs/src/AppTask.cpp b/examples/dishwasher-app/silabs/src/AppTask.cpp index 948f1b590bc9fe..de686f68e957e0 100644 --- a/examples/dishwasher-app/silabs/src/AppTask.cpp +++ b/examples/dishwasher-app/silabs/src/AppTask.cpp @@ -21,12 +21,12 @@ #include #include -#include #include #include #include #include #include +#include #include #include diff --git a/examples/energy-management-app/esp32/main/main.cpp b/examples/energy-management-app/esp32/main/main.cpp index e63c110d35ce59..76d9b831ad3e4f 100644 --- a/examples/energy-management-app/esp32/main/main.cpp +++ b/examples/energy-management-app/esp32/main/main.cpp @@ -38,11 +38,11 @@ #include "shell_extension/openthread_cli_register.h" #include #include -#include #include #include #include #include +#include #if CONFIG_ENABLE_ESP32_FACTORY_DATA_PROVIDER #include diff --git a/examples/energy-management-app/silabs/src/AppTask.cpp b/examples/energy-management-app/silabs/src/AppTask.cpp index b5155f1dd3b0d5..c4f0c3be793df5 100644 --- a/examples/energy-management-app/silabs/src/AppTask.cpp +++ b/examples/energy-management-app/silabs/src/AppTask.cpp @@ -28,12 +28,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include diff --git a/examples/light-switch-app/ameba/main/chipinterface.cpp b/examples/light-switch-app/ameba/main/chipinterface.cpp index f883f0e030f9eb..0b51b49d54febd 100644 --- a/examples/light-switch-app/ameba/main/chipinterface.cpp +++ b/examples/light-switch-app/ameba/main/chipinterface.cpp @@ -29,13 +29,13 @@ #include #include -#include #include #include #include #include #include #include +#include #if CONFIG_ENABLE_AMEBA_CRYPTO #include #endif diff --git a/examples/light-switch-app/asr/src/AppTask.cpp b/examples/light-switch-app/asr/src/AppTask.cpp old mode 100755 new mode 100644 index 6dcabc80a9e91c..f8b3bcb4da57cc --- a/examples/light-switch-app/asr/src/AppTask.cpp +++ b/examples/light-switch-app/asr/src/AppTask.cpp @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -41,6 +40,7 @@ #include #include #include +#include #include #include diff --git a/examples/light-switch-app/cc13x4_26x4/src/AppTask.cpp b/examples/light-switch-app/cc13x4_26x4/src/AppTask.cpp index ce836b0c264821..f562e8bbfed4cc 100644 --- a/examples/light-switch-app/cc13x4_26x4/src/AppTask.cpp +++ b/examples/light-switch-app/cc13x4_26x4/src/AppTask.cpp @@ -50,9 +50,9 @@ #include #include #include -#include #include #include +#include #include #include diff --git a/examples/light-switch-app/esp32/main/main.cpp b/examples/light-switch-app/esp32/main/main.cpp index 88b34f2b9ad884..5072e5584a954a 100644 --- a/examples/light-switch-app/esp32/main/main.cpp +++ b/examples/light-switch-app/esp32/main/main.cpp @@ -31,10 +31,10 @@ #include "nvs_flash.h" #include "shell_extension/launch.h" -#include #include #include #include +#include #if CONFIG_ENABLE_ESP32_FACTORY_DATA_PROVIDER #include diff --git a/examples/light-switch-app/genio/src/AppTask.cpp b/examples/light-switch-app/genio/src/AppTask.cpp index 95adc2f402d925..bcb5f58ce13a5d 100644 --- a/examples/light-switch-app/genio/src/AppTask.cpp +++ b/examples/light-switch-app/genio/src/AppTask.cpp @@ -27,10 +27,10 @@ #include #include -#include #include #include #include +#include #include diff --git a/examples/light-switch-app/nrfconnect/main/AppTask.cpp b/examples/light-switch-app/nrfconnect/main/AppTask.cpp index a7420e44c44f5b..6eddd878402e3c 100644 --- a/examples/light-switch-app/nrfconnect/main/AppTask.cpp +++ b/examples/light-switch-app/nrfconnect/main/AppTask.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -36,6 +35,7 @@ #include #include #include +#include #include #ifdef CONFIG_CHIP_WIFI diff --git a/examples/light-switch-app/qpg/src/AppTask.cpp b/examples/light-switch-app/qpg/src/AppTask.cpp index d9878c7fe31672..959f2e63aa4274 100644 --- a/examples/light-switch-app/qpg/src/AppTask.cpp +++ b/examples/light-switch-app/qpg/src/AppTask.cpp @@ -29,7 +29,7 @@ using namespace ::chip; #include "AppTask.h" #include "ota.h" -#include +#include #include #include diff --git a/examples/light-switch-app/silabs/src/AppTask.cpp b/examples/light-switch-app/silabs/src/AppTask.cpp index 140a99136d6ef3..2ffaf11a73d304 100644 --- a/examples/light-switch-app/silabs/src/AppTask.cpp +++ b/examples/light-switch-app/silabs/src/AppTask.cpp @@ -33,13 +33,13 @@ #include "qrcodegen.h" #endif // QR_CODE_ENABLED #endif // DISPLAY_ENABLED -#include #include #include #include #include #include #include +#include #include #include diff --git a/examples/lighting-app/ameba/main/chipinterface.cpp b/examples/lighting-app/ameba/main/chipinterface.cpp index 0587d3134cadee..b336baddd29745 100644 --- a/examples/lighting-app/ameba/main/chipinterface.cpp +++ b/examples/lighting-app/ameba/main/chipinterface.cpp @@ -31,12 +31,12 @@ #include #include -#include #include #include #include #include #include +#include #if CONFIG_ENABLE_AMEBA_CRYPTO #include #endif diff --git a/examples/lighting-app/asr/src/AppTask.cpp b/examples/lighting-app/asr/src/AppTask.cpp old mode 100755 new mode 100644 index 9bbd40af01a3a7..5684d5bc1fdca3 --- a/examples/lighting-app/asr/src/AppTask.cpp +++ b/examples/lighting-app/asr/src/AppTask.cpp @@ -23,11 +23,11 @@ #include "DeviceCallbacks.h" #include "LEDWidget.h" #include "qrcodegen.h" -#include #include #include #include #include +#include #include #include diff --git a/examples/lighting-app/beken/main/chipinterface.cpp b/examples/lighting-app/beken/main/chipinterface.cpp index 69111dea792b1c..61d067bbe545c7 100644 --- a/examples/lighting-app/beken/main/chipinterface.cpp +++ b/examples/lighting-app/beken/main/chipinterface.cpp @@ -28,11 +28,11 @@ #include #include -#include #include #include #include #include +#include #include #include diff --git a/examples/lighting-app/bouffalolab/common/AppTask.cpp b/examples/lighting-app/bouffalolab/common/AppTask.cpp index aa2039bf4e8620..99fb0a4c07ea04 100644 --- a/examples/lighting-app/bouffalolab/common/AppTask.cpp +++ b/examples/lighting-app/bouffalolab/common/AppTask.cpp @@ -20,12 +20,12 @@ #include #include -#include #include #include #include #include #include +#include #include #if HEAP_MONITORING diff --git a/examples/lighting-app/cc13x4_26x4/src/AppTask.cpp b/examples/lighting-app/cc13x4_26x4/src/AppTask.cpp index 3ff950ba0ca1fb..35982c5f5e097b 100644 --- a/examples/lighting-app/cc13x4_26x4/src/AppTask.cpp +++ b/examples/lighting-app/cc13x4_26x4/src/AppTask.cpp @@ -44,10 +44,10 @@ #include #include -#include #include #include #include +#include #include #include diff --git a/examples/lighting-app/esp32/main/DeviceWithDisplay.h b/examples/lighting-app/esp32/main/DeviceWithDisplay.h index a52a50f79816c0..01c5b448b13d11 100644 --- a/examples/lighting-app/esp32/main/DeviceWithDisplay.h +++ b/examples/lighting-app/esp32/main/DeviceWithDisplay.h @@ -37,8 +37,8 @@ #include #include -#include #include +#include #if CONFIG_DEVICE_TYPE_M5STACK #define BUTTON_1_GPIO_NUM ((gpio_num_t) 39) // Left button on M5Stack diff --git a/examples/lighting-app/esp32/main/main.cpp b/examples/lighting-app/esp32/main/main.cpp index 9b2d6e1d3e35a8..8604c6594caeb9 100644 --- a/examples/lighting-app/esp32/main/main.cpp +++ b/examples/lighting-app/esp32/main/main.cpp @@ -34,10 +34,10 @@ #include "shell_extension/launch.h" #include "shell_extension/openthread_cli_register.h" #include -#include #include #include #include +#include #if CONFIG_ENABLE_ESP_INSIGHTS_SYSTEM_STATS #include diff --git a/examples/lighting-app/genio/src/AppTask.cpp b/examples/lighting-app/genio/src/AppTask.cpp index b6b31cec05abe7..61c958c9ad554f 100644 --- a/examples/lighting-app/genio/src/AppTask.cpp +++ b/examples/lighting-app/genio/src/AppTask.cpp @@ -29,10 +29,10 @@ #include #include #include -#include #include #include #include +#include #include diff --git a/examples/lighting-app/infineon/psoc6/src/AppTask.cpp b/examples/lighting-app/infineon/psoc6/src/AppTask.cpp index 47d68bc3bead8a..871a44fb637e60 100644 --- a/examples/lighting-app/infineon/psoc6/src/AppTask.cpp +++ b/examples/lighting-app/infineon/psoc6/src/AppTask.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -34,6 +33,7 @@ #include #include #include +#include #include #include diff --git a/examples/lighting-app/mbed/main/AppTask.cpp b/examples/lighting-app/mbed/main/AppTask.cpp index c4def4fe0ef006..b1fa44ba5090fb 100644 --- a/examples/lighting-app/mbed/main/AppTask.cpp +++ b/examples/lighting-app/mbed/main/AppTask.cpp @@ -21,13 +21,13 @@ #include "LightingManager.h" #include -#include #include #include #include #include #include #include +#include // mbed-os headers #include "drivers/Timeout.h" diff --git a/examples/lighting-app/nrfconnect/main/AppTask.cpp b/examples/lighting-app/nrfconnect/main/AppTask.cpp index 93f5cf44c0f26e..2e0834fe54782d 100644 --- a/examples/lighting-app/nrfconnect/main/AppTask.cpp +++ b/examples/lighting-app/nrfconnect/main/AppTask.cpp @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -40,6 +39,7 @@ #include #include #include +#include #include #ifdef CONFIG_CHIP_WIFI diff --git a/examples/lighting-app/nxp/k32w0/main/AppTask.cpp b/examples/lighting-app/nxp/k32w0/main/AppTask.cpp index 62221a23f1a6f1..78eea44ff52738 100644 --- a/examples/lighting-app/nxp/k32w0/main/AppTask.cpp +++ b/examples/lighting-app/nxp/k32w0/main/AppTask.cpp @@ -18,11 +18,9 @@ */ #include "AppTask.h" #include "AppEvent.h" -#include #include #include -#include #include #include #include @@ -30,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/examples/lighting-app/qpg/src/AppTask.cpp b/examples/lighting-app/qpg/src/AppTask.cpp index 53b255dfa8cb7e..b74f02b5997310 100644 --- a/examples/lighting-app/qpg/src/AppTask.cpp +++ b/examples/lighting-app/qpg/src/AppTask.cpp @@ -35,11 +35,11 @@ #include #include #include -#include #include #include #include #include +#include #include #include diff --git a/examples/lighting-app/silabs/src/AppTask.cpp b/examples/lighting-app/silabs/src/AppTask.cpp index 4f74ca7f348e78..f3e624e988e0bc 100644 --- a/examples/lighting-app/silabs/src/AppTask.cpp +++ b/examples/lighting-app/silabs/src/AppTask.cpp @@ -24,9 +24,9 @@ #include "LEDWidget.h" #include -#include #include #include +#include #include diff --git a/examples/lighting-app/stm32/src/STM32WB5/AppTask.cpp b/examples/lighting-app/stm32/src/STM32WB5/AppTask.cpp index 701493b777f381..0ed3497d33e0b4 100644 --- a/examples/lighting-app/stm32/src/STM32WB5/AppTask.cpp +++ b/examples/lighting-app/stm32/src/STM32WB5/AppTask.cpp @@ -38,13 +38,13 @@ #include #include #include -#include #include #include #include #include #include #include +#include #include #include diff --git a/examples/lit-icd-app/nrfconnect/main/AppTask.cpp b/examples/lit-icd-app/nrfconnect/main/AppTask.cpp index 64000faa677b23..e4af08246c1a0e 100644 --- a/examples/lit-icd-app/nrfconnect/main/AppTask.cpp +++ b/examples/lit-icd-app/nrfconnect/main/AppTask.cpp @@ -23,8 +23,8 @@ #include -#include #include +#include #include #include diff --git a/examples/lit-icd-app/silabs/src/AppTask.cpp b/examples/lit-icd-app/silabs/src/AppTask.cpp index 0f330e700b9548..d7e97d0bb22cbd 100644 --- a/examples/lit-icd-app/silabs/src/AppTask.cpp +++ b/examples/lit-icd-app/silabs/src/AppTask.cpp @@ -35,13 +35,13 @@ #include #include -#include #include #include #include #include #include #include +#include #include #include diff --git a/examples/lock-app/asr/src/AppTask.cpp b/examples/lock-app/asr/src/AppTask.cpp index 4d359a4bc6eab3..ecb794286e794f 100644 --- a/examples/lock-app/asr/src/AppTask.cpp +++ b/examples/lock-app/asr/src/AppTask.cpp @@ -29,12 +29,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include diff --git a/examples/lock-app/cc13x4_26x4/src/AppTask.cpp b/examples/lock-app/cc13x4_26x4/src/AppTask.cpp index b67d795e1bb8b7..98e4fc85e85140 100644 --- a/examples/lock-app/cc13x4_26x4/src/AppTask.cpp +++ b/examples/lock-app/cc13x4_26x4/src/AppTask.cpp @@ -43,10 +43,10 @@ #include #include -#include #include #include #include +#include #include #include diff --git a/examples/lock-app/cc32xx/main/AppTask.cpp b/examples/lock-app/cc32xx/main/AppTask.cpp index 4973c7a380676c..8462e12e6200ae 100644 --- a/examples/lock-app/cc32xx/main/AppTask.cpp +++ b/examples/lock-app/cc32xx/main/AppTask.cpp @@ -39,8 +39,8 @@ #include #include -#include #include +#include #include #include diff --git a/examples/lock-app/esp32/main/AppTask.cpp b/examples/lock-app/esp32/main/AppTask.cpp index fbca981316f69b..84182fe46a7159 100644 --- a/examples/lock-app/esp32/main/AppTask.cpp +++ b/examples/lock-app/esp32/main/AppTask.cpp @@ -21,8 +21,8 @@ #include "esp_log.h" #include #include -#include #include +#include #include #include diff --git a/examples/lock-app/genio/src/AppTask.cpp b/examples/lock-app/genio/src/AppTask.cpp index f27a2fcad76b9b..20806f989d1422 100644 --- a/examples/lock-app/genio/src/AppTask.cpp +++ b/examples/lock-app/genio/src/AppTask.cpp @@ -28,10 +28,10 @@ #include #include #include -#include #include #include #include +#include #include diff --git a/examples/lock-app/infineon/psoc6/src/AppTask.cpp b/examples/lock-app/infineon/psoc6/src/AppTask.cpp index c4880e10937889..b5aaf64defc105 100644 --- a/examples/lock-app/infineon/psoc6/src/AppTask.cpp +++ b/examples/lock-app/infineon/psoc6/src/AppTask.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -36,6 +35,7 @@ #include #include #include +#include #include #include diff --git a/examples/lock-app/mbed/main/AppTask.cpp b/examples/lock-app/mbed/main/AppTask.cpp index 851d96a61b4c75..94cc8e37f4ba81 100644 --- a/examples/lock-app/mbed/main/AppTask.cpp +++ b/examples/lock-app/mbed/main/AppTask.cpp @@ -21,13 +21,13 @@ #include #include -#include #include #include #include #include #include #include +#include // mbed-os headers #include "drivers/Timeout.h" diff --git a/examples/lock-app/nrfconnect/main/AppTask.cpp b/examples/lock-app/nrfconnect/main/AppTask.cpp index 0706374befff8b..8248227d51bf05 100644 --- a/examples/lock-app/nrfconnect/main/AppTask.cpp +++ b/examples/lock-app/nrfconnect/main/AppTask.cpp @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -37,6 +36,7 @@ #include #include #include +#include #include #ifdef CONFIG_CHIP_WIFI diff --git a/examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp b/examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp index cda08552ca2edf..bdb4af82020f6d 100644 --- a/examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp +++ b/examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp @@ -18,12 +18,10 @@ */ #include "AppTask.h" #include "AppEvent.h" -#include #include #include #include -#include #include #include #include @@ -31,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/examples/lock-app/qpg/src/AppTask.cpp b/examples/lock-app/qpg/src/AppTask.cpp index 35d972aa7ae536..6b147e85b4d29c 100644 --- a/examples/lock-app/qpg/src/AppTask.cpp +++ b/examples/lock-app/qpg/src/AppTask.cpp @@ -28,7 +28,7 @@ #include "AppTask.h" #include "ota.h" -#include +#include #include #include diff --git a/examples/lock-app/silabs/src/AppTask.cpp b/examples/lock-app/silabs/src/AppTask.cpp index 4e4d05a810acb8..3dd0a0ba7c9c69 100644 --- a/examples/lock-app/silabs/src/AppTask.cpp +++ b/examples/lock-app/silabs/src/AppTask.cpp @@ -37,9 +37,9 @@ #include #include -#include #include #include +#include #include diff --git a/examples/ota-provider-app/esp32/main/main.cpp b/examples/ota-provider-app/esp32/main/main.cpp index ae1a9906f28014..16541a652f39eb 100644 --- a/examples/ota-provider-app/esp32/main/main.cpp +++ b/examples/ota-provider-app/esp32/main/main.cpp @@ -20,7 +20,6 @@ #include "esp_spi_flash.h" #include "esp_spiffs.h" #include "nvs_flash.h" -#include #include #include #include @@ -28,6 +27,7 @@ #include #include #include +#include #include #include diff --git a/examples/ota-requestor-app/asr/src/AppTask.cpp b/examples/ota-requestor-app/asr/src/AppTask.cpp old mode 100755 new mode 100644 index 78c4ec47b8be1f..152db9d89839cd --- a/examples/ota-requestor-app/asr/src/AppTask.cpp +++ b/examples/ota-requestor-app/asr/src/AppTask.cpp @@ -24,12 +24,12 @@ #include "init_Matter.h" #include "qrcodegen.h" #include -#include #include #include #include #include #include +#include #include #include diff --git a/examples/ota-requestor-app/esp32/main/main.cpp b/examples/ota-requestor-app/esp32/main/main.cpp index e375ded305e1dc..dd13cf924d9067 100644 --- a/examples/ota-requestor-app/esp32/main/main.cpp +++ b/examples/ota-requestor-app/esp32/main/main.cpp @@ -24,7 +24,6 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "nvs_flash.h" -#include #include #include #include @@ -32,6 +31,7 @@ #include #include #include +#include #include #include "OTAImageProcessorImpl.h" diff --git a/examples/ota-requestor-app/genio/src/AppTask.cpp b/examples/ota-requestor-app/genio/src/AppTask.cpp index 68826454a267bc..9da5ca25bad573 100644 --- a/examples/ota-requestor-app/genio/src/AppTask.cpp +++ b/examples/ota-requestor-app/genio/src/AppTask.cpp @@ -18,11 +18,11 @@ */ #include #include -#include #include #include #include #include +#include #include diff --git a/examples/ota-requestor-app/mbed/main/AppTask.cpp b/examples/ota-requestor-app/mbed/main/AppTask.cpp index cad1b73b00afed..b08d7001a920ec 100644 --- a/examples/ota-requestor-app/mbed/main/AppTask.cpp +++ b/examples/ota-requestor-app/mbed/main/AppTask.cpp @@ -20,13 +20,13 @@ #include #include -#include #include #include #include #include #include #include +#include // mbed-os headers #include "drivers/Timeout.h" diff --git a/examples/platform/asr/init_Matter.cpp b/examples/platform/asr/init_Matter.cpp index 85fbb241ce77c2..48682ef9c14ff8 100644 --- a/examples/platform/asr/init_Matter.cpp +++ b/examples/platform/asr/init_Matter.cpp @@ -19,13 +19,13 @@ #include "AppConfig.h" #include #include -#include #include #include #include #include #include #include +#include #ifdef CONFIG_ENABLE_CHIP_SHELL #include #endif diff --git a/examples/platform/asr/shell/matter_shell.cpp b/examples/platform/asr/shell/matter_shell.cpp index bfa138f92ff0e5..8d3c91f96a8ec1 100644 --- a/examples/platform/asr/shell/matter_shell.cpp +++ b/examples/platform/asr/shell/matter_shell.cpp @@ -28,10 +28,10 @@ #include #include #include -#include #include #include #include +#include #include #include #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR diff --git a/examples/platform/bouffalolab/common/plat/platform.cpp b/examples/platform/bouffalolab/common/plat/platform.cpp index 39ec050dfb74cf..13b07ec0a3e992 100644 --- a/examples/platform/bouffalolab/common/plat/platform.cpp +++ b/examples/platform/bouffalolab/common/plat/platform.cpp @@ -18,12 +18,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #if HEAP_MONITORING diff --git a/examples/platform/infineon/cyw30739/matter_config.cpp b/examples/platform/infineon/cyw30739/matter_config.cpp index 23fe5308baf713..18d8dc2b2219e1 100644 --- a/examples/platform/infineon/cyw30739/matter_config.cpp +++ b/examples/platform/infineon/cyw30739/matter_config.cpp @@ -37,7 +37,6 @@ #include "wiced_hal_i2c.h" #endif #include -#include #include #include #include @@ -48,6 +47,7 @@ #include #include #include +#include #include #ifdef BOARD_USE_OPTIGA diff --git a/examples/platform/linux/AppMain.cpp b/examples/platform/linux/AppMain.cpp index b4fb0cb13b7027..b0e4274a8462ff 100644 --- a/examples/platform/linux/AppMain.cpp +++ b/examples/platform/linux/AppMain.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -31,6 +30,7 @@ #include #include #include +#include #include diff --git a/examples/platform/linux/CommissionerMain.cpp b/examples/platform/linux/CommissionerMain.cpp index 75719017a5a380..7475ffedc0dc8f 100644 --- a/examples/platform/linux/CommissionerMain.cpp +++ b/examples/platform/linux/CommissionerMain.cpp @@ -22,7 +22,6 @@ #include #include -#include #include #include #include @@ -31,6 +30,7 @@ #include #include #include +#include #include #include diff --git a/examples/platform/linux/Options.cpp b/examples/platform/linux/Options.cpp index fa56b62feac4c1..2101c2cbdd7d02 100644 --- a/examples/platform/linux/Options.cpp +++ b/examples/platform/linux/Options.cpp @@ -23,7 +23,7 @@ #include "Options.h" -#include +#include #include #include diff --git a/examples/platform/nxp/common/app_task/source/AppTaskBase.cpp b/examples/platform/nxp/common/app_task/source/AppTaskBase.cpp index 8490e1f1117ce7..8d816042a303fe 100644 --- a/examples/platform/nxp/common/app_task/source/AppTaskBase.cpp +++ b/examples/platform/nxp/common/app_task/source/AppTaskBase.cpp @@ -26,9 +26,9 @@ #include #include -#include #include #include +#include #include diff --git a/examples/platform/nxp/se05x/linux/AppMain.cpp b/examples/platform/nxp/se05x/linux/AppMain.cpp index 2d45f7dfeda0ba..47a67f64afde52 100644 --- a/examples/platform/nxp/se05x/linux/AppMain.cpp +++ b/examples/platform/nxp/se05x/linux/AppMain.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include #include @@ -28,6 +27,7 @@ #include #include #include +#include #include #include diff --git a/examples/platform/openiotsdk/app/openiotsdk_platform.cpp b/examples/platform/openiotsdk/app/openiotsdk_platform.cpp index d9a268c7c22f14..40414c28700e66 100644 --- a/examples/platform/openiotsdk/app/openiotsdk_platform.cpp +++ b/examples/platform/openiotsdk/app/openiotsdk_platform.cpp @@ -42,11 +42,11 @@ #include #ifdef USE_CHIP_DATA_MODEL -#include #include #include #include #include +#include #endif // USE_CHIP_DATA_MODEL #ifdef CHIP_OPEN_IOT_SDK_OTA_ENABLE diff --git a/examples/platform/silabs/BaseApplication.cpp b/examples/platform/silabs/BaseApplication.cpp index 9ceef7fc7dab75..600a6653c9275e 100644 --- a/examples/platform/silabs/BaseApplication.cpp +++ b/examples/platform/silabs/BaseApplication.cpp @@ -44,12 +44,12 @@ #endif // ENABLE_CHIP_SHELL #endif // CHIP_CONFIG_ENABLE_ICD_SERVER -#include #include #include #include #include #include +#include #include #include #include diff --git a/examples/platform/telink/common/src/AppTaskCommon.cpp b/examples/platform/telink/common/src/AppTaskCommon.cpp index 860fc7115ecc93..c5807b035b191a 100644 --- a/examples/platform/telink/common/src/AppTaskCommon.cpp +++ b/examples/platform/telink/common/src/AppTaskCommon.cpp @@ -34,11 +34,11 @@ #include #include #include -#include #include #include #include #include +#include #if CONFIG_BOOTLOADER_MCUBOOT #include diff --git a/examples/pump-app/cc13x4_26x4/main/AppTask.cpp b/examples/pump-app/cc13x4_26x4/main/AppTask.cpp index 08bd6ea4bad2c9..260f59d358c021 100644 --- a/examples/pump-app/cc13x4_26x4/main/AppTask.cpp +++ b/examples/pump-app/cc13x4_26x4/main/AppTask.cpp @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/examples/pump-app/nrfconnect/main/AppTask.cpp b/examples/pump-app/nrfconnect/main/AppTask.cpp index 3aa16dba35c96e..9bd3de9fd04344 100644 --- a/examples/pump-app/nrfconnect/main/AppTask.cpp +++ b/examples/pump-app/nrfconnect/main/AppTask.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -36,6 +35,7 @@ #include #include #include +#include #include #if CONFIG_CHIP_OTA_REQUESTOR diff --git a/examples/pump-app/silabs/src/AppTask.cpp b/examples/pump-app/silabs/src/AppTask.cpp index 1b4881ff77db51..df76fcca219d0e 100644 --- a/examples/pump-app/silabs/src/AppTask.cpp +++ b/examples/pump-app/silabs/src/AppTask.cpp @@ -26,9 +26,9 @@ #include "LEDWidget.h" #include -#include #include #include +#include #include diff --git a/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp b/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp index 0e9097e3cb48db..4ccf7c8b89b564 100644 --- a/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp +++ b/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/examples/pump-controller-app/nrfconnect/main/AppTask.cpp b/examples/pump-controller-app/nrfconnect/main/AppTask.cpp index e22c3c75e37c12..37c557003227a8 100644 --- a/examples/pump-controller-app/nrfconnect/main/AppTask.cpp +++ b/examples/pump-controller-app/nrfconnect/main/AppTask.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -36,6 +35,7 @@ #include #include #include +#include #include #if CONFIG_CHIP_OTA_REQUESTOR diff --git a/examples/refrigerator-app/asr/src/AppTask.cpp b/examples/refrigerator-app/asr/src/AppTask.cpp index 5ac229c9b99a29..0141774b723d2b 100644 --- a/examples/refrigerator-app/asr/src/AppTask.cpp +++ b/examples/refrigerator-app/asr/src/AppTask.cpp @@ -21,11 +21,11 @@ #include "CHIPDeviceManager.h" #include "DeviceCallbacks.h" #include "qrcodegen.h" -#include #include #include #include #include +#include #include #include diff --git a/examples/refrigerator-app/silabs/src/AppTask.cpp b/examples/refrigerator-app/silabs/src/AppTask.cpp index c9dc451b71ddb1..34e71cd591b651 100644 --- a/examples/refrigerator-app/silabs/src/AppTask.cpp +++ b/examples/refrigerator-app/silabs/src/AppTask.cpp @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -50,6 +49,7 @@ #include #include #include +#include #include #include diff --git a/examples/shell/cc13x4_26x4/main/AppTask.cpp b/examples/shell/cc13x4_26x4/main/AppTask.cpp index c3f7a3da5b1286..120d09db540f9d 100644 --- a/examples/shell/cc13x4_26x4/main/AppTask.cpp +++ b/examples/shell/cc13x4_26x4/main/AppTask.cpp @@ -22,13 +22,13 @@ #include "FreeRTOS.h" -#include #include #include #include #include #include #include +#include #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR #include @@ -41,7 +41,6 @@ #include #include -#include #include /* syscfg */ diff --git a/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp b/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp index 105a3c9e5b6d9c..7ef8b1c7a0e6e7 100644 --- a/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp +++ b/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp @@ -21,13 +21,13 @@ #include "LEDWidget.h" #include -#include #include #include #include #include #include #include +#include #include #include diff --git a/examples/temperature-measurement-app/asr/src/AppTask.cpp b/examples/temperature-measurement-app/asr/src/AppTask.cpp old mode 100755 new mode 100644 index e55657e45bf095..f04c3d98e6123c --- a/examples/temperature-measurement-app/asr/src/AppTask.cpp +++ b/examples/temperature-measurement-app/asr/src/AppTask.cpp @@ -22,11 +22,11 @@ #include "CHIPDeviceManager.h" #include "DeviceCallbacks.h" #include "qrcodegen.h" -#include #include #include #include #include +#include #include #include diff --git a/examples/thermostat/asr/src/AppTask.cpp b/examples/thermostat/asr/src/AppTask.cpp old mode 100755 new mode 100644 index 6117fbf972b52c..b74a51f5759898 --- a/examples/thermostat/asr/src/AppTask.cpp +++ b/examples/thermostat/asr/src/AppTask.cpp @@ -25,12 +25,12 @@ #include "qrcodegen.h" #include -#include #include #include #include #include #include +#include #include #include diff --git a/examples/thermostat/genio/src/AppTask.cpp b/examples/thermostat/genio/src/AppTask.cpp index 2cd1c479f90fcd..75c736b794dff4 100644 --- a/examples/thermostat/genio/src/AppTask.cpp +++ b/examples/thermostat/genio/src/AppTask.cpp @@ -26,10 +26,10 @@ #include #include -#include #include #include #include +#include #include diff --git a/examples/thermostat/qpg/src/AppTask.cpp b/examples/thermostat/qpg/src/AppTask.cpp index 41342e410c88bd..695a9ae48a2851 100644 --- a/examples/thermostat/qpg/src/AppTask.cpp +++ b/examples/thermostat/qpg/src/AppTask.cpp @@ -24,7 +24,7 @@ #include "AppTask.h" #include "ota.h" -#include +#include #include #include diff --git a/examples/thermostat/silabs/src/AppTask.cpp b/examples/thermostat/silabs/src/AppTask.cpp index e033a3fe2b9144..2a704b65508804 100644 --- a/examples/thermostat/silabs/src/AppTask.cpp +++ b/examples/thermostat/silabs/src/AppTask.cpp @@ -39,13 +39,13 @@ #include #include #include -#include #include #include #include #include #include #include +#include #include #include diff --git a/examples/thread-br-app/esp32/main/main.cpp b/examples/thread-br-app/esp32/main/main.cpp index 3c3e95b973cabc..6d7763c3e743ae 100644 --- a/examples/thread-br-app/esp32/main/main.cpp +++ b/examples/thread-br-app/esp32/main/main.cpp @@ -35,11 +35,11 @@ #include "support/CHIPMem.h" #include -#include #include #include #include #include +#include #if CONFIG_ENABLE_ESP32_FACTORY_DATA_PROVIDER #include diff --git a/examples/window-app/nrfconnect/main/AppTask.cpp b/examples/window-app/nrfconnect/main/AppTask.cpp index 2b6fb6ba667bb6..93a005bd5fef89 100644 --- a/examples/window-app/nrfconnect/main/AppTask.cpp +++ b/examples/window-app/nrfconnect/main/AppTask.cpp @@ -27,12 +27,12 @@ #include #include #include -#include #include #include #include #include #include +#include #if CONFIG_CHIP_OTA_REQUESTOR #include "OTAUtil.h" diff --git a/examples/window-app/silabs/src/AppTask.cpp b/examples/window-app/silabs/src/AppTask.cpp index 214a405b619ecf..de1bdcb4a8e500 100644 --- a/examples/window-app/silabs/src/AppTask.cpp +++ b/examples/window-app/silabs/src/AppTask.cpp @@ -23,9 +23,9 @@ #include "WindowManager.h" -#include #include #include +#include #include diff --git a/examples/window-app/silabs/src/WindowManager.cpp b/examples/window-app/silabs/src/WindowManager.cpp index f3a4faf3c103f5..3bf20aa809893f 100644 --- a/examples/window-app/silabs/src/WindowManager.cpp +++ b/examples/window-app/silabs/src/WindowManager.cpp @@ -27,12 +27,12 @@ #include #include -#include #include #include #include #include #include +#include #ifdef SL_WIFI #include diff --git a/src/app/chip_data_model.cmake b/src/app/chip_data_model.cmake index 65d3c0ada5effe..317120c4cf5e49 100644 --- a/src/app/chip_data_model.cmake +++ b/src/app/chip_data_model.cmake @@ -86,7 +86,6 @@ function(chip_configure_data_model APP_TARGET) ${CHIP_APP_BASE_DIR}/server/DefaultTermsAndConditionsProvider.cpp ${CHIP_APP_BASE_DIR}/server/Dnssd.cpp ${CHIP_APP_BASE_DIR}/server/EchoHandler.cpp - ${CHIP_APP_BASE_DIR}/server/OnboardingCodesUtil.cpp ${CHIP_APP_BASE_DIR}/server/Server.cpp ) diff --git a/src/app/server/BUILD.gn b/src/app/server/BUILD.gn index 040c7b2227ff2a..1190bec2992b12 100644 --- a/src/app/server/BUILD.gn +++ b/src/app/server/BUILD.gn @@ -57,8 +57,6 @@ static_library("server") { "Dnssd.h", "EchoHandler.cpp", "EchoHandler.h", - "OnboardingCodesUtil.cpp", - "OnboardingCodesUtil.h", "Server.cpp", "Server.h", ] @@ -81,7 +79,6 @@ static_library("server") { "${chip_root}/src/messaging", "${chip_root}/src/platform", "${chip_root}/src/protocols", - "${chip_root}/src/setup_payload", "${chip_root}/src/transport", ] diff --git a/src/app/server/java/AndroidAppServerWrapper.cpp b/src/app/server/java/AndroidAppServerWrapper.cpp index 15d2d8fa6955e8..10e08821add86c 100644 --- a/src/app/server/java/AndroidAppServerWrapper.cpp +++ b/src/app/server/java/AndroidAppServerWrapper.cpp @@ -18,7 +18,6 @@ #include "AndroidAppServerWrapper.h" -#include #include #include #include @@ -30,6 +29,7 @@ #include #include #include +#include #include #include #include diff --git a/src/controller/python/chip/server/ServerInit.cpp b/src/controller/python/chip/server/ServerInit.cpp index ca1efee777b629..4d13dea8a0d9c9 100644 --- a/src/controller/python/chip/server/ServerInit.cpp +++ b/src/controller/python/chip/server/ServerInit.cpp @@ -18,9 +18,9 @@ #include #include -#include #include #include +#include #include #include diff --git a/src/lib/BUILD.gn b/src/lib/BUILD.gn index fc9d1289838f1c..759f65ed8e6457 100644 --- a/src/lib/BUILD.gn +++ b/src/lib/BUILD.gn @@ -30,6 +30,7 @@ source_set("without-logging") { "${chip_root}/src/platform", "${chip_root}/src/protocols", "${chip_root}/src/setup_payload", + "${chip_root}/src/setup_payload:onboarding-codes-utils", "${chip_root}/src/system", "${chip_root}/src/transport", ] diff --git a/src/lib/shell/commands/BUILD.gn b/src/lib/shell/commands/BUILD.gn index a0a8052a6402c6..a2f5a9d5971bd2 100644 --- a/src/lib/shell/commands/BUILD.gn +++ b/src/lib/shell/commands/BUILD.gn @@ -65,7 +65,7 @@ source_set("commands") { } if (chip_device_platform != "none") { - public_deps += [ "${chip_root}/src/app/server" ] + deps = [ "${chip_root}/src/setup_payload:onboarding-codes-utils" ] } cflags = [ "-Wconversion" ] diff --git a/src/lib/shell/commands/NFC.cpp b/src/lib/shell/commands/NFC.cpp index 5311c638e88944..60c9facb9ad73d 100644 --- a/src/lib/shell/commands/NFC.cpp +++ b/src/lib/shell/commands/NFC.cpp @@ -20,9 +20,9 @@ #if CONFIG_DEVICE_LAYER #include #endif -#include #include #include +#include using chip::DeviceLayer::ConnectivityMgr; diff --git a/src/lib/shell/commands/OnboardingCodes.cpp b/src/lib/shell/commands/OnboardingCodes.cpp index a08a63be68770f..1f314d4c11e591 100644 --- a/src/lib/shell/commands/OnboardingCodes.cpp +++ b/src/lib/shell/commands/OnboardingCodes.cpp @@ -15,7 +15,6 @@ * limitations under the License. */ -#include #include #include #include @@ -24,6 +23,7 @@ #include #include #include +#include #include #define CHIP_SHELL_MAX_BUFFER_SIZE 128 diff --git a/src/setup_payload/BUILD.gn b/src/setup_payload/BUILD.gn index 30b97ceca74349..e42e2e9ceafcee 100644 --- a/src/setup_payload/BUILD.gn +++ b/src/setup_payload/BUILD.gn @@ -79,3 +79,16 @@ static_library("setup_payload") { "${chip_root}/src/lib/support", ] } + +source_set("onboarding-codes-utils") { + sources = [ + "OnboardingCodesUtil.cpp", + "OnboardingCodesUtil.h", + ] + + deps = [ "${chip_root}/src/platform" ] + + public_deps = [ "${chip_root}/src/setup_payload" ] + + public_configs = [ "${chip_root}/src:includes" ] +} diff --git a/src/app/server/OnboardingCodesUtil.cpp b/src/setup_payload/OnboardingCodesUtil.cpp similarity index 99% rename from src/app/server/OnboardingCodesUtil.cpp rename to src/setup_payload/OnboardingCodesUtil.cpp index 7f78da41695ff4..70e0bf7b3e9729 100644 --- a/src/app/server/OnboardingCodesUtil.cpp +++ b/src/setup_payload/OnboardingCodesUtil.cpp @@ -16,7 +16,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/src/app/server/OnboardingCodesUtil.h b/src/setup_payload/OnboardingCodesUtil.h similarity index 100% rename from src/app/server/OnboardingCodesUtil.h rename to src/setup_payload/OnboardingCodesUtil.h From 4d33cc3178eb32d28c5db17b5a7d470ab3dcb01b Mon Sep 17 00:00:00 2001 From: Adrian Gielniewski Date: Thu, 6 Feb 2025 20:50:33 +0100 Subject: [PATCH 2/5] [mw320] Remove shell dependency on app/server Use PlatformMgr directly. Signed-off-by: Adrian Gielniewski --- src/lib/shell/MainLoopMW320.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/shell/MainLoopMW320.cpp b/src/lib/shell/MainLoopMW320.cpp index 833c87a3bc5e7b..8445587b40ccae 100644 --- a/src/lib/shell/MainLoopMW320.cpp +++ b/src/lib/shell/MainLoopMW320.cpp @@ -16,7 +16,6 @@ */ #include "streamer.h" -#include #include #include #include @@ -161,7 +160,7 @@ static void AtExitShell(void); static CHIP_ERROR ShutdownHandler(int argc, char ** argv) { streamer_printf(streamer_get(), "Shutdown and Goodbye\r\n"); - Server::GetInstance().GenerateShutDownEvent(); + DeviceLayer::PlatformMgr().ScheduleWork([](intptr_t) { DeviceLayer::PlatformMgr().HandleServerShuttingDown(); }); // TODO: This is assuming that we did (on a different thread from this one) // RunEventLoop(), not StartEventLoopTask(). It will not work correctly // with StartEventLoopTask(). From afbd36e750e3ae3f432d2e5f17a0b81a8f9177b9 Mon Sep 17 00:00:00 2001 From: Adrian Gielniewski Date: Thu, 6 Feb 2025 20:50:33 +0100 Subject: [PATCH 3/5] [NXP][examples] Add missing dependency Signed-off-by: Adrian Gielniewski --- examples/all-clusters-app/nxp/rt/rt1060/BUILD.gn | 5 ++++- examples/all-clusters-app/nxp/rt/rt1170/BUILD.gn | 5 ++++- examples/all-clusters-app/nxp/rt/rw61x/BUILD.gn | 1 + examples/contact-sensor-app/nxp/k32w1/BUILD.gn | 1 + examples/contact-sensor-app/nxp/mcxw71/BUILD.gn | 1 + examples/laundry-washer-app/nxp/rt/rt1060/BUILD.gn | 5 ++++- examples/laundry-washer-app/nxp/rt/rt1170/BUILD.gn | 5 ++++- examples/laundry-washer-app/nxp/rt/rw61x/BUILD.gn | 1 + examples/lighting-app/nxp/k32w1/BUILD.gn | 1 + examples/lighting-app/nxp/mcxw71/BUILD.gn | 1 + examples/lock-app/nxp/k32w1/BUILD.gn | 1 + examples/lock-app/nxp/mcxw71/BUILD.gn | 1 + examples/platform/nxp/se05x/linux/BUILD.gn | 2 ++ examples/thermostat/nxp/rt/rt1060/BUILD.gn | 5 ++++- examples/thermostat/nxp/rt/rt1170/BUILD.gn | 5 ++++- examples/thermostat/nxp/rt/rw61x/BUILD.gn | 1 + 16 files changed, 35 insertions(+), 6 deletions(-) diff --git a/examples/all-clusters-app/nxp/rt/rt1060/BUILD.gn b/examples/all-clusters-app/nxp/rt/rt1060/BUILD.gn index d5a4936a48f5a0..d6cafd66efbc55 100644 --- a/examples/all-clusters-app/nxp/rt/rt1060/BUILD.gn +++ b/examples/all-clusters-app/nxp/rt/rt1060/BUILD.gn @@ -159,7 +159,10 @@ rt_executable("all_cluster_app") { "${common_example_dir}/matter_button/source/ButtonRegistrationDefault.cpp", ] - deps = [ "${chip_root}/examples/${app_common_folder}" ] + deps = [ + "${chip_root}/examples/${app_common_folder}", + "${chip_root}/src/setup_payload:onboarding-codes-utils", + ] sources += [ "${chip_root}/examples/${app_common_folder}/src/bridged-actions-stub.cpp", diff --git a/examples/all-clusters-app/nxp/rt/rt1170/BUILD.gn b/examples/all-clusters-app/nxp/rt/rt1170/BUILD.gn index edbd208506b824..c913b0541b72c7 100644 --- a/examples/all-clusters-app/nxp/rt/rt1170/BUILD.gn +++ b/examples/all-clusters-app/nxp/rt/rt1170/BUILD.gn @@ -145,7 +145,10 @@ rt_executable("all_cluster_app") { "${common_example_dir}/matter_button/source/ButtonRegistrationEmpty.cpp", ] - deps = [ "${chip_root}/examples/${app_common_folder}" ] + deps = [ + "${chip_root}/examples/${app_common_folder}", + "${chip_root}/src/setup_payload:onboarding-codes-utils", + ] sources += [ "${chip_root}/examples/${app_common_folder}/src/bridged-actions-stub.cpp", diff --git a/examples/all-clusters-app/nxp/rt/rw61x/BUILD.gn b/examples/all-clusters-app/nxp/rt/rw61x/BUILD.gn index cb4e017b9b45bf..af376d0f4ad158 100644 --- a/examples/all-clusters-app/nxp/rt/rw61x/BUILD.gn +++ b/examples/all-clusters-app/nxp/rt/rw61x/BUILD.gn @@ -167,6 +167,7 @@ rt_executable("all_cluster_app") { deps = [ "${chip_root}/examples/${app_common_folder}", "${chip_root}/src/platform/logging:default", + "${chip_root}/src/setup_payload:onboarding-codes-utils", ] sources += [ diff --git a/examples/contact-sensor-app/nxp/k32w1/BUILD.gn b/examples/contact-sensor-app/nxp/k32w1/BUILD.gn index e3694a5c44359b..8b32596478fb62 100644 --- a/examples/contact-sensor-app/nxp/k32w1/BUILD.gn +++ b/examples/contact-sensor-app/nxp/k32w1/BUILD.gn @@ -218,6 +218,7 @@ mcxw71_k32w1_executable("contact_sensor_app") { deps += [ "${chip_root}/examples/providers:device_info_provider", "${chip_root}/src/platform/logging:default", + "${chip_root}/src/setup_payload:onboarding-codes-utils", ] #lit and sit are using different zap files diff --git a/examples/contact-sensor-app/nxp/mcxw71/BUILD.gn b/examples/contact-sensor-app/nxp/mcxw71/BUILD.gn index d0c6109ce4b676..df7e467ab7a0b8 100644 --- a/examples/contact-sensor-app/nxp/mcxw71/BUILD.gn +++ b/examples/contact-sensor-app/nxp/mcxw71/BUILD.gn @@ -217,6 +217,7 @@ mcxw71_k32w1_executable("contact_sensor_app") { deps += [ "${chip_root}/examples/providers:device_info_provider", "${chip_root}/src/platform/logging:default", + "${chip_root}/src/setup_payload:onboarding-codes-utils", ] #lit and sit are using different zap files diff --git a/examples/laundry-washer-app/nxp/rt/rt1060/BUILD.gn b/examples/laundry-washer-app/nxp/rt/rt1060/BUILD.gn index 4e417419464ee8..874f899e01003e 100644 --- a/examples/laundry-washer-app/nxp/rt/rt1060/BUILD.gn +++ b/examples/laundry-washer-app/nxp/rt/rt1060/BUILD.gn @@ -178,7 +178,10 @@ rt_executable("laundry-washer") { "${common_example_dir}/matter_button/source/ButtonRegistrationDefault.cpp", ] - deps = [ "${chip_root}/examples/${app_common_folder}" ] + deps = [ + "${chip_root}/examples/${app_common_folder}", + "${chip_root}/src/setup_payload:onboarding-codes-utils", + ] sources += [ "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp", diff --git a/examples/laundry-washer-app/nxp/rt/rt1170/BUILD.gn b/examples/laundry-washer-app/nxp/rt/rt1170/BUILD.gn index 0e0e71e8c2dfc1..7b87f7497f2d3c 100644 --- a/examples/laundry-washer-app/nxp/rt/rt1170/BUILD.gn +++ b/examples/laundry-washer-app/nxp/rt/rt1170/BUILD.gn @@ -166,7 +166,10 @@ rt_executable("laundry-washer-app") { "${common_example_dir}/matter_button/source/ButtonRegistrationEmpty.cpp", ] - deps = [ "${chip_root}/examples/${app_common_folder}" ] + deps = [ + "${chip_root}/examples/${app_common_folder}", + "${chip_root}/src/setup_payload:onboarding-codes-utils", + ] sources += [ "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp", diff --git a/examples/laundry-washer-app/nxp/rt/rw61x/BUILD.gn b/examples/laundry-washer-app/nxp/rt/rw61x/BUILD.gn index 1ef89a3852c2d9..a7dcee0a8da4ad 100644 --- a/examples/laundry-washer-app/nxp/rt/rw61x/BUILD.gn +++ b/examples/laundry-washer-app/nxp/rt/rw61x/BUILD.gn @@ -188,6 +188,7 @@ rt_executable("laundry-washer") { deps = [ "${chip_root}/examples/${app_common_folder}", "${chip_root}/src/platform/logging:default", + "${chip_root}/src/setup_payload:onboarding-codes-utils", ] sources += [ diff --git a/examples/lighting-app/nxp/k32w1/BUILD.gn b/examples/lighting-app/nxp/k32w1/BUILD.gn index e66b9c3bf2d3e4..63a9106769d779 100644 --- a/examples/lighting-app/nxp/k32w1/BUILD.gn +++ b/examples/lighting-app/nxp/k32w1/BUILD.gn @@ -208,6 +208,7 @@ mcxw71_k32w1_executable("light_app") { deps += [ "${chip_root}/examples/providers:device_info_provider", "${chip_root}/src/platform/logging:default", + "${chip_root}/src/setup_payload:onboarding-codes-utils", ] if (nxp_config_dimmable_led) { diff --git a/examples/lighting-app/nxp/mcxw71/BUILD.gn b/examples/lighting-app/nxp/mcxw71/BUILD.gn index 815f95debd93fd..82f516e9d87204 100644 --- a/examples/lighting-app/nxp/mcxw71/BUILD.gn +++ b/examples/lighting-app/nxp/mcxw71/BUILD.gn @@ -211,6 +211,7 @@ mcxw71_k32w1_executable("light_app") { deps += [ "${chip_root}/examples/providers:device_info_provider", "${chip_root}/src/platform/logging:default", + "${chip_root}/src/setup_payload:onboarding-codes-utils", ] if (nxp_config_dimmable_led) { diff --git a/examples/lock-app/nxp/k32w1/BUILD.gn b/examples/lock-app/nxp/k32w1/BUILD.gn index ba1d9053ce8767..52e7835c3edf95 100644 --- a/examples/lock-app/nxp/k32w1/BUILD.gn +++ b/examples/lock-app/nxp/k32w1/BUILD.gn @@ -250,6 +250,7 @@ mcxw71_k32w1_executable("lock_app") { deps += [ "${chip_root}/examples/providers:device_info_provider", "${chip_root}/src/platform/logging:default", + "${chip_root}/src/setup_payload:onboarding-codes-utils", ] deps += [ "${chip_root}/examples/lock-app/nxp/zap:zap" ] diff --git a/examples/lock-app/nxp/mcxw71/BUILD.gn b/examples/lock-app/nxp/mcxw71/BUILD.gn index f49e938aa7ee27..dacb4d83c2320c 100644 --- a/examples/lock-app/nxp/mcxw71/BUILD.gn +++ b/examples/lock-app/nxp/mcxw71/BUILD.gn @@ -250,6 +250,7 @@ mcxw71_k32w1_executable("lock_app") { deps += [ "${chip_root}/examples/providers:device_info_provider", "${chip_root}/src/platform/logging:default", + "${chip_root}/src/setup_payload:onboarding-codes-utils", ] deps += [ "${chip_root}/examples/lock-app/nxp/zap:zap" ] diff --git a/examples/platform/nxp/se05x/linux/BUILD.gn b/examples/platform/nxp/se05x/linux/BUILD.gn index a5efe460745ddd..9c98d0ebfab11a 100644 --- a/examples/platform/nxp/se05x/linux/BUILD.gn +++ b/examples/platform/nxp/se05x/linux/BUILD.gn @@ -71,6 +71,8 @@ source_set("app-main") { defines += [ "ENABLE_CHIP_SHELL" ] } + deps = [ "${chip_root}/src/setup_payload:onboarding-codes-utils" ] + public_deps = [ ":ota-test-event-trigger", "${chip_root}/examples/providers:device_info_provider", diff --git a/examples/thermostat/nxp/rt/rt1060/BUILD.gn b/examples/thermostat/nxp/rt/rt1060/BUILD.gn index 83f9da9bc27ab1..3e881afe08d6b4 100644 --- a/examples/thermostat/nxp/rt/rt1060/BUILD.gn +++ b/examples/thermostat/nxp/rt/rt1060/BUILD.gn @@ -197,7 +197,10 @@ rt_executable("thermostat") { "${common_example_dir}/matter_button/source/ButtonRegistrationDefault.cpp", ] - deps = [ "${chip_root}/examples/${app_common_folder}" ] + deps = [ + "${chip_root}/examples/${app_common_folder}", + "${chip_root}/src/setup_payload:onboarding-codes-utils", + ] if (nxp_enable_matter_cli) { defines += [ "ENABLE_CHIP_SHELL" ] diff --git a/examples/thermostat/nxp/rt/rt1170/BUILD.gn b/examples/thermostat/nxp/rt/rt1170/BUILD.gn index 3e03df43488247..3db3b8640a6dfe 100644 --- a/examples/thermostat/nxp/rt/rt1170/BUILD.gn +++ b/examples/thermostat/nxp/rt/rt1170/BUILD.gn @@ -183,7 +183,10 @@ rt_executable("thermostat") { "${common_example_dir}/matter_button/source/ButtonRegistrationEmpty.cpp", ] - deps = [ "${chip_root}/examples/${app_common_folder}" ] + deps = [ + "${chip_root}/examples/${app_common_folder}", + "${chip_root}/src/setup_payload:onboarding-codes-utils", + ] if (nxp_enable_matter_cli) { defines += [ "ENABLE_CHIP_SHELL" ] diff --git a/examples/thermostat/nxp/rt/rw61x/BUILD.gn b/examples/thermostat/nxp/rt/rw61x/BUILD.gn index 6dd71061c010c5..911b1d60d57414 100644 --- a/examples/thermostat/nxp/rt/rw61x/BUILD.gn +++ b/examples/thermostat/nxp/rt/rw61x/BUILD.gn @@ -207,6 +207,7 @@ rt_executable("thermostat") { deps = [ "${chip_root}/examples/${app_common_folder}", "${chip_root}/src/platform/logging:default", + "${chip_root}/src/setup_payload:onboarding-codes-utils", ] if (nxp_enable_matter_cli) { From 90ab5821a7b9c24b224009338185e03ba8ccb8ea Mon Sep 17 00:00:00 2001 From: Adrian Gielniewski Date: Thu, 6 Feb 2025 20:50:33 +0100 Subject: [PATCH 4/5] [linux][examples] Add missing dependency Signed-off-by: Adrian Gielniewski --- examples/platform/linux/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/platform/linux/BUILD.gn b/examples/platform/linux/BUILD.gn index ec4659e6022689..4ae6bd832cc97a 100644 --- a/examples/platform/linux/BUILD.gn +++ b/examples/platform/linux/BUILD.gn @@ -115,6 +115,7 @@ source_set("app-main") { "${chip_root}/examples/providers:device_info_provider", "${chip_root}/src/app/server", "${chip_root}/src/app/tests/suites/credentials:dac_provider", + "${chip_root}/src/setup_payload:onboarding-codes-utils", ] if (current_os != "nuttx") { From 4d93f880914279fb079ab2ef27dbabcf10a4eb55 Mon Sep 17 00:00:00 2001 From: Adrian Gielniewski Date: Thu, 6 Feb 2025 20:50:33 +0100 Subject: [PATCH 5/5] [Infineon][examples] Add missing dependency Signed-off-by: Adrian Gielniewski --- examples/platform/infineon/cyw30739/cyw30739_example.gni | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/platform/infineon/cyw30739/cyw30739_example.gni b/examples/platform/infineon/cyw30739/cyw30739_example.gni index ff07ff6eb28633..20fb494f434c04 100644 --- a/examples/platform/infineon/cyw30739/cyw30739_example.gni +++ b/examples/platform/infineon/cyw30739/cyw30739_example.gni @@ -39,6 +39,7 @@ template("cyw30739_example") { deps = [ "${chip_root}/examples/providers:device_info_provider", "${chip_root}/examples/shell/shell_common:shell_common", + "${chip_root}/src/setup_payload:onboarding-codes-utils", "${matter_wpan_sdk_build_root}:${board}", app_data_model, ]