diff --git a/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj.conf b/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj.conf index dbc593a78710..1423370eae63 100644 --- a/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj.conf +++ b/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj.conf @@ -16,13 +16,6 @@ CONFIG_CHIP_PROJECT_CONFIG="src/chip_project_config.h" CONFIG_CHIP_DEVICE_PRODUCT_ID=32781 CONFIG_STD_CPP14=y -CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y -CONFIG_OPENTHREAD_MTD=y -CONFIG_OPENTHREAD_FTD=n - -# Enable Matter Sleepy End Device -CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT=y - # Enable Bluetooth Low Energy CONFIG_BT_DEVICE_NAME="MatterWeather" @@ -30,34 +23,19 @@ CONFIG_BT_DEVICE_NAME="MatterWeather" CONFIG_DK_LIBRARY=y CONFIG_PWM=y -# Configure UART logging and shell -CONFIG_LOG=y -CONFIG_LOG_MODE_DEFERRED=y -CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1024 -CONFIG_LOG_BUFFER_SIZE=8192 -CONFIG_LOG_FUNC_NAME_PREFIX_DBG=n -CONFIG_MATTER_LOG_LEVEL_DBG=y -CONFIG_SHELL=y -CONFIG_SHELL_LOG_BACKEND=y - -# Configure USB CDC ACM -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n -CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Matter Weather" -CONFIG_USB_DEVICE_PID=0x530D -CONFIG_UART_LINE_CTRL=y -CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51 - # Configure Thingy:53 sensors CONFIG_I2C=y CONFIG_SENSOR=y CONFIG_BME680=y CONFIG_ADC=y +# Suspend devices when the CPU goes into sleep +CONFIG_PM_DEVICE=y + # Other settings CONFIG_IEEE802154_NRF5_RX_STACK_SIZE=8192 CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y -CONFIG_PM_DEVICE=y CONFIG_CHIP_LIB_SHELL=y # Average Thingy:53 current consumption @@ -75,3 +53,20 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 # 0x0302 (Temp. sensor) CONFIG_CHIP_DEVICE_TYPE=770 CONFIG_BT_RX_STACK_SIZE=1500 + +# Configure UART logging and shell +CONFIG_LOG=y +CONFIG_LOG_MODE_DEFERRED=y +CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1024 +CONFIG_LOG_BUFFER_SIZE=8192 +CONFIG_LOG_FUNC_NAME_PREFIX_DBG=n +CONFIG_MATTER_LOG_LEVEL_DBG=y +CONFIG_SHELL=y +CONFIG_SHELL_LOG_BACKEND=y + +# Configure USB CDC ACM +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n +CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Matter Weather" +CONFIG_USB_DEVICE_PID=0x530D +CONFIG_UART_LINE_CTRL=y +CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51 diff --git a/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj_release.conf b/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj_release.conf index f29560072b5d..2d57b4c2628a 100644 --- a/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj_release.conf +++ b/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj_release.conf @@ -23,32 +23,18 @@ CONFIG_BT_DEVICE_NAME="MatterWeather" CONFIG_DK_LIBRARY=y CONFIG_PWM=y -# Disable all debug features -CONFIG_SHELL=n -CONFIG_OPENTHREAD_SHELL=n -CONFIG_CONSOLE=n -CONFIG_UART_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_LOG=n -CONFIG_LOG_MODE_MINIMAL=n -CONFIG_THREAD_NAME=n -CONFIG_ASSERT_VERBOSE=n -CONFIG_ASSERT_NO_FILE_INFO=y - # Configure Thingy:53 sensors CONFIG_I2C=y CONFIG_SENSOR=y CONFIG_BME680=y CONFIG_ADC=y -# Other settings +# Suspend devices when the CPU goes into sleep CONFIG_PM_DEVICE=y # Average Thingy:53 current consumption CONFIG_AVERAGE_CURRENT_CONSUMPTION=10000 -CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n - # Bootloader and MCUmgr (OTA DFU) Configuration CONFIG_MCUBOOT_IMAGE_VERSION="2.4.0+0" @@ -61,3 +47,18 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 # 0x0302 (Temp. sensor) CONFIG_CHIP_DEVICE_TYPE=770 CONFIG_BT_RX_STACK_SIZE=1500 + +# Disable all debug features +CONFIG_SHELL=n +CONFIG_OPENTHREAD_SHELL=n +CONFIG_CONSOLE=n +CONFIG_UART_CONSOLE=n +CONFIG_SERIAL=n +CONFIG_LOG=n +CONFIG_LOG_MODE_MINIMAL=n +CONFIG_THREAD_NAME=n +CONFIG_ASSERT_VERBOSE=n +CONFIG_ASSERT_NO_FILE_INFO=y + +# Disable USB CDC ACM +CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n diff --git a/samples/matter/light_bulb/sample.yaml b/samples/matter/light_bulb/sample.yaml index 61274fa9415d..7ee8cc81f2c9 100644 --- a/samples/matter/light_bulb/sample.yaml +++ b/samples/matter/light_bulb/sample.yaml @@ -2,6 +2,14 @@ sample: description: Matter Light Bulb example name: Matter Light Bulb tests: + sample.matter.light_bulb.release: + build_only: true + extra_args: CONF_FILE=prj_release.conf + integration_platforms: + - nrf52840dk_nrf52840 + - nrf5340dk_nrf5340_cpuapp + - nrf7002dk_nrf5340_cpuapp + platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp sample.matter.light_bulb.ffs: build_only: true extra_args: > diff --git a/samples/matter/light_switch/prj.conf b/samples/matter/light_switch/prj.conf index fa77a77f90f1..9a156d254136 100644 --- a/samples/matter/light_switch/prj.conf +++ b/samples/matter/light_switch/prj.conf @@ -17,6 +17,9 @@ CONFIG_DK_LIBRARY=y # Bluetooth Low Energy configuration CONFIG_BT_DEVICE_NAME="MatterSwitch" +# Suspend devices when the CPU goes into sleep +CONFIG_PM_DEVICE=y + # Other settings CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y diff --git a/samples/matter/light_switch/prj_release.conf b/samples/matter/light_switch/prj_release.conf index 33e41999bfe4..c7bd70077afd 100644 --- a/samples/matter/light_switch/prj_release.conf +++ b/samples/matter/light_switch/prj_release.conf @@ -17,12 +17,12 @@ CONFIG_DK_LIBRARY=y # Bluetooth Low Energy configuration CONFIG_BT_DEVICE_NAME="MatterSwitch" -# Enable system reset on fatal error -CONFIG_RESET_ON_FATAL_ERROR=y - # Suspend devices when the CPU goes into sleep CONFIG_PM_DEVICE=y +# Enable system reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=y + # Disable all debug features CONFIG_USE_SEGGER_RTT=n CONFIG_SHELL=n diff --git a/samples/matter/light_switch/sample.yaml b/samples/matter/light_switch/sample.yaml index ce1e21fddff7..20a2bfa2a35b 100644 --- a/samples/matter/light_switch/sample.yaml +++ b/samples/matter/light_switch/sample.yaml @@ -2,6 +2,14 @@ sample: description: Matter Light Switch example name: Matter Light Switch tests: + sample.matter.light_switch.release: + build_only: true + extra_args: CONF_FILE=prj_release.conf + integration_platforms: + - nrf52840dk_nrf52840 + - nrf5340dk_nrf5340_cpuapp + - nrf7002dk_nrf5340_cpuapp + platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp sample.matter.light_switch.debug: build_only: true integration_platforms: diff --git a/samples/matter/lock/prj.conf b/samples/matter/lock/prj.conf index 0a3011a58e3c..9038232e08a6 100644 --- a/samples/matter/lock/prj.conf +++ b/samples/matter/lock/prj.conf @@ -21,6 +21,9 @@ CONFIG_DK_LIBRARY=y # Bluetooth Low Energy configuration CONFIG_BT_DEVICE_NAME="MatterLock" +# Suspend devices when the CPU goes into sleep +CONFIG_PM_DEVICE=y + # Other settings CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y diff --git a/samples/matter/lock/prj_release.conf b/samples/matter/lock/prj_release.conf index 8239b256ec76..9ce08f872e22 100644 --- a/samples/matter/lock/prj_release.conf +++ b/samples/matter/lock/prj_release.conf @@ -21,12 +21,12 @@ CONFIG_DK_LIBRARY=y # Bluetooth Low Energy configuration CONFIG_BT_DEVICE_NAME="MatterLock" -# Enable system reset on fatal error -CONFIG_RESET_ON_FATAL_ERROR=y - # Suspend devices when the CPU goes into sleep CONFIG_PM_DEVICE=y +# Enable system reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=y + # Disable all debug features CONFIG_USE_SEGGER_RTT=n CONFIG_SHELL=n diff --git a/samples/matter/template/sample.yaml b/samples/matter/template/sample.yaml index 729810e530bd..c2315ca9676e 100644 --- a/samples/matter/template/sample.yaml +++ b/samples/matter/template/sample.yaml @@ -9,3 +9,11 @@ tests: - nrf5340dk_nrf5340_cpuapp - nrf7002dk_nrf5340_cpuapp platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp + sample.matter.template.release: + build_only: true + extra_args: CONF_FILE=prj_release.conf + integration_platforms: + - nrf52840dk_nrf52840 + - nrf5340dk_nrf5340_cpuapp + - nrf7002dk_nrf5340_cpuapp + platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp diff --git a/samples/matter/thermostat/sample.yaml b/samples/matter/thermostat/sample.yaml index 497c8a3f47d7..9d4f0bf438ce 100644 --- a/samples/matter/thermostat/sample.yaml +++ b/samples/matter/thermostat/sample.yaml @@ -9,3 +9,11 @@ tests: - nrf5340dk_nrf5340_cpuapp - nrf7002dk_nrf5340_cpuapp platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp + sample.matter.thermostat.release: + build_only: true + extra_args: CONF_FILE=prj_release.conf + integration_platforms: + - nrf52840dk_nrf52840 + - nrf5340dk_nrf5340_cpuapp + - nrf7002dk_nrf5340_cpuapp + platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp diff --git a/samples/matter/window_covering/prj.conf b/samples/matter/window_covering/prj.conf index 1156ad0bdcff..05863445ef24 100644 --- a/samples/matter/window_covering/prj.conf +++ b/samples/matter/window_covering/prj.conf @@ -33,6 +33,9 @@ CONFIG_CHIP_SED_ACTIVE_INTERVAL=500 # Bluetooth Low Energy configuration CONFIG_BT_DEVICE_NAME="MatterWinCov" +# Suspend devices when the CPU goes into sleep +CONFIG_PM_DEVICE=y + # Stack size settings CONFIG_IEEE802154_NRF5_RX_STACK_SIZE=1024 diff --git a/samples/matter/window_covering/prj_release.conf b/samples/matter/window_covering/prj_release.conf index a24e5ee0ec69..68e7fcef290d 100644 --- a/samples/matter/window_covering/prj_release.conf +++ b/samples/matter/window_covering/prj_release.conf @@ -33,14 +33,14 @@ CONFIG_CHIP_SED_ACTIVE_INTERVAL=500 # Bluetooth Low Energy configuration CONFIG_BT_DEVICE_NAME="MatterWinCov" -# Enable system reset on fatal error -CONFIG_RESET_ON_FATAL_ERROR=y +# Suspend devices when the CPU goes into sleep +CONFIG_PM_DEVICE=y # Stack size settings CONFIG_IEEE802154_NRF5_RX_STACK_SIZE=1024 -# Suspend devices when the CPU goes into sleep -CONFIG_PM_DEVICE=y +# Enable system reset on fatal error +CONFIG_RESET_ON_FATAL_ERROR=y # Disable all debug features CONFIG_USE_SEGGER_RTT=n diff --git a/samples/matter/window_covering/sample.yaml b/samples/matter/window_covering/sample.yaml index cea0f3986e09..96668e3fd07a 100644 --- a/samples/matter/window_covering/sample.yaml +++ b/samples/matter/window_covering/sample.yaml @@ -8,3 +8,10 @@ tests: - nrf52840dk_nrf52840 - nrf5340dk_nrf5340_cpuapp platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp + sample.matter.window_cover.release: + build_only: true + extra_args: CONF_FILE=prj_release.conf + integration_platforms: + - nrf52840dk_nrf52840 + - nrf5340dk_nrf5340_cpuapp + platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp diff --git a/scripts/quarantine_integration.yaml b/scripts/quarantine_integration.yaml index 6789fcb1b7bb..08aaa7fb1c97 100644 --- a/scripts/quarantine_integration.yaml +++ b/scripts/quarantine_integration.yaml @@ -8,6 +8,11 @@ - sample.matter.thermostat.debug - sample.matter.light_bulb.persistent_subscriptions - sample.matter.light_switch.persistent_subscriptions + - sample.matter.light_bulb.release + - sample.matter.light_switch.release + - sample.matter.template.release + - sample.matter.thermostat.release + - sample.matter.window_cover.release platforms: - nrf52840dk_nrf52840 comment: "Configurations excluded to limit resources usage in integration builds" @@ -20,6 +25,11 @@ - sample.matter.light_bulb.ffs - sample.matter.light_bulb.persistent_subscriptions - sample.matter.light_switch.persistent_subscriptions + - sample.matter.light_bulb.release + - sample.matter.light_switch.release + - sample.matter.template.release + - sample.matter.thermostat.release + - sample.matter.window_cover.release platforms: - nrf5340dk_nrf5340_cpuapp comment: "Configurations excluded to limit resources usage in integration builds" @@ -35,6 +45,10 @@ - sample.matter.lock.release - sample.matter.light_bulb.persistent_subscriptions - sample.matter.light_switch.persistent_subscriptions + - sample.matter.light_bulb.release + - sample.matter.light_switch.release + - sample.matter.template.release + - sample.matter.thermostat.release platforms: - nrf7002dk_nrf5340_cpuapp comment: "Configurations excluded to limit resources usage in integration builds"