Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

samples: matter: Moved watchdog enabling into snippet #18783

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+193 −194
Open

samples: matter: Moved watchdog enabling into snippet #18783

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@
&usbd {
status = "disabled";
};
&wdt0 {
status = "disabled";
};
6 changes: 3 additions & 3 deletions applications/matter_bridge/boards/nrf7002dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
chosen {
nordic,pm-ext-flash = &mx25r64;
};
};

aliases {
watchdog0 = &wdt0;
};
&wdt0 {
status = "disabled";
};
3 changes: 0 additions & 3 deletions applications/matter_bridge/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,5 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=y
# Enable the Read Client for binding purposes
CONFIG_CHIP_ENABLE_READ_CLIENT=y

# Enable Watchdog
CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y

# Increase heap size to accommodate the memory required for additional bridged devices.
CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=16384
3 changes: 3 additions & 0 deletions applications/matter_bridge/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ tests:
extra_args: FILE_SUFFIX=release
CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE=n
CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE=y
matter_bridge_SNIPPET="matter-watchdog"
integration_platforms:
- nrf7002dk/nrf5340/cpuapp
- nrf5340dk/nrf5340/cpuapp
Expand Down Expand Up @@ -46,6 +47,7 @@ tests:
extra_args: FILE_SUFFIX=release CONFIG_BRIDGED_DEVICE_BT=y
CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE=n
CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE=y
matter_bridge_SNIPPET="matter-watchdog"
integration_platforms:
- nrf7002dk/nrf5340/cpuapp
- nrf5340dk/nrf5340/cpuapp
Expand Down Expand Up @@ -89,6 +91,7 @@ tests:
build_only: true
extra_args: FILE_SUFFIX=release SB_CONFIG_WIFI_NRF70=y CONFIG_CHIP_WIFI=y
matter_bridge_SHIELD="nrf7002eb_interposer_p1;nrf7002eb" CONFIG_BRIDGED_DEVICE_BT=y
matter_bridge_SNIPPET="matter-watchdog"
integration_platforms:
- nrf54h20dk/nrf54h20/cpuapp
platform_allow: nrf54h20dk/nrf54h20/cpuapp
Expand Down
3 changes: 0 additions & 3 deletions applications/matter_weather_station/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n
# Use minimal C library instead of the Picolib
CONFIG_MINIMAL_LIBC=y

# Enable Watchdog
CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y

# Enable Diagnostic Logs feature
CONFIG_NCS_SAMPLE_MATTER_DIAGNOSTIC_LOGS=y
CONFIG_NCS_SAMPLE_MATTER_DIAGNOSTIC_LOGS_CRASH_LOGS=y
Expand Down
9 changes: 0 additions & 9 deletions samples/matter/common/dts/nrf54h20/nrf54h20_cpuapp_peripherals.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@
zephyr,bt-hci-ipc = &ipc0;
extmem-device = &mx25uw63;
};

aliases {
watchdog0 = &cpuapp_wdt010;
};
};

/* Watchdog */
&cpuapp_wdt010 {
status = "okay";
};

/* Communication between Application Core and Secure Domain */
Expand Down
3 changes: 3 additions & 0 deletions samples/matter/light_bulb/boards/nrf21540dk_nrf52840.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,6 @@
&usbd {
status = "disabled";
};
&wdt0 {
status = "disabled";
};
3 changes: 3 additions & 0 deletions samples/matter/light_bulb/boards/nrf52840dk_nrf52840.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,6 @@
&usbd {
status = "disabled";
};
&wdt0 {
status = "disabled";
};
3 changes: 3 additions & 0 deletions samples/matter/light_bulb/boards/nrf5340dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,6 @@
&usbd {
status = "disabled";
};
&wdt0 {
status = "disabled";
};
7 changes: 0 additions & 7 deletions samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
aliases {
// Configure PWM module for led1 (LED2 on the board)
pwm-led1 = &pwm_led1;

// Use watchdog wdt31 as the application watchdog
watchdog0 = &wdt31;
};

pwmleds {
Expand Down Expand Up @@ -65,7 +62,3 @@
};
};
};

&wdt31 {
status = "okay";
};
7 changes: 0 additions & 7 deletions samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
aliases {
// Configure PWM module for led1 (LED2 on the board)
pwm-led1 = &pwm_led1;

// Use watchdog wdt31 as the application watchdog
watchdog0 = &wdt31;
};

chosen {
Expand Down Expand Up @@ -65,10 +62,6 @@
};
};

&wdt31 {
status = "okay";
};

// Change IRQ ids to handle button interrupts.

// The default values for nRF54L15 are 219 and 269,
Expand Down
5 changes: 4 additions & 1 deletion samples/matter/light_bulb/boards/nrf7002dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*/
aliases {
pwm-led1 = &pwm_led1;
watchdog0 = &wdt0;
};

pwmleds {
Expand Down Expand Up @@ -56,3 +55,7 @@
};

};

&wdt0 {
status = "disabled";
};
3 changes: 0 additions & 3 deletions samples/matter/light_bulb/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,3 @@ CONFIG_BOOT_BANNER=n
# Enable Factory Data feature
CONFIG_CHIP_FACTORY_DATA=y
CONFIG_CHIP_FACTORY_DATA_BUILD=y

# Enable Watchdog
CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y
2 changes: 1 addition & 1 deletion samples/matter/light_bulb/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ tests:
sample.matter.light_bulb.release:
sysbuild: true
build_only: true
extra_args: FILE_SUFFIX=release
extra_args: FILE_SUFFIX=release light_bulb_SNIPPET="matter-watchdog"
SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_PARTITION_MANAGER=y
integration_platforms:
- nrf52840dk/nrf52840
Expand Down
3 changes: 3 additions & 0 deletions samples/matter/light_switch/boards/nrf21540dk_nrf52840.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@
&usbd {
status = "disabled";
};
&wdt0 {
status = "disabled";
};
3 changes: 3 additions & 0 deletions samples/matter/light_switch/boards/nrf52840dk_nrf52840.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@
&usbd {
status = "disabled";
};
&wdt0 {
status = "disabled";
};
3 changes: 3 additions & 0 deletions samples/matter/light_switch/boards/nrf5340dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@
&usbd {
status = "disabled";
};
&wdt0 {
status = "disabled";
};
9 changes: 0 additions & 9 deletions samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
*/

/ {
aliases {
// Use watchdog wdt31 as the application watchdog
watchdog0 = &wdt31;
};

chosen {
nordic,pm-ext-flash = &mx25r64;
};
Expand All @@ -33,7 +28,3 @@
&mx25r64 {
status = "okay";
};

&wdt31 {
status = "okay";
};
9 changes: 0 additions & 9 deletions samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
*/

/ {
aliases {
// Use watchdog wdt31 as the application watchdog
watchdog0 = &wdt31;
};

chosen {
nordic,pm-ext-flash = &mx25r64;
};
Expand All @@ -34,10 +29,6 @@
status = "okay";
};

&wdt31 {
status = "okay";
};

// Change IRQ ids to handle button interrupts.

// The default values for nRF54L15 are 219 and 269,
Expand Down
8 changes: 4 additions & 4 deletions samples/matter/light_switch/boards/nrf7002dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
chosen {
nordic,pm-ext-flash = &mx25r64;
};

aliases {
watchdog0 = &wdt0;
};
};

/* Set IPC thread priority to the highest value to not collide with other threads. */
&ipc0 {
zephyr,priority = <0 PRIO_COOP>;
};

&wdt0 {
status = "disabled";
};
3 changes: 0 additions & 3 deletions samples/matter/light_switch/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,3 @@ CONFIG_BOOT_BANNER=n
# Enable Factory Data feature
CONFIG_CHIP_FACTORY_DATA=y
CONFIG_CHIP_FACTORY_DATA_BUILD=y

# Enable Watchdog
CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y
2 changes: 1 addition & 1 deletion samples/matter/light_switch/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ tests:
sample.matter.light_switch.release:
sysbuild: true
build_only: true
extra_args: FILE_SUFFIX=release
extra_args: FILE_SUFFIX=release light_switch_SNIPPET="matter-watchdog"
SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_PARTITION_MANAGER=y
integration_platforms:
- nrf52840dk/nrf52840
Expand Down
3 changes: 3 additions & 0 deletions samples/matter/lock/boards/nrf21540dk_nrf52840.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@
&usbd {
status = "disabled";
};
&wdt0 {
status = "disabled";
};
3 changes: 3 additions & 0 deletions samples/matter/lock/boards/nrf52840dk_nrf52840.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@
&usbd {
status = "disabled";
};
&wdt0 {
status = "disabled";
};
3 changes: 3 additions & 0 deletions samples/matter/lock/boards/nrf5340dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@
&usbd {
status = "disabled";
};
&wdt0 {
status = "disabled";
};
9 changes: 0 additions & 9 deletions samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
*/

/ {
aliases {
// Use watchdog wdt31 as the application watchdog
watchdog0 = &wdt31;
};

chosen {
nordic,pm-ext-flash = &mx25r64;
};
Expand All @@ -33,7 +28,3 @@
&mx25r64 {
status = "okay";
};

&wdt31 {
status = "okay";
};
9 changes: 0 additions & 9 deletions samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
*/

/ {
aliases {
// Use watchdog wdt31 as the application watchdog
watchdog0 = &wdt31;
};

chosen {
nordic,pm-ext-flash = &mx25r64;
};
Expand All @@ -34,10 +29,6 @@
status = "okay";
};

&wdt31 {
status = "okay";
};

// Change IRQ ids to handle button interrupts.

// The default values for nRF54L15 are 219 and 269,
Expand Down
8 changes: 4 additions & 4 deletions samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
chosen {
nordic,pm-ext-flash = &mx25r64;
};

aliases {
watchdog0 = &wdt0;
};
};

/* Set IPC thread priority to the highest value to not collide with other threads. */
&ipc0 {
zephyr,priority = <0 PRIO_COOP>;
};

&wdt0 {
status = "disabled";
};
8 changes: 4 additions & 4 deletions samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
chosen {
nordic,pm-ext-flash = &mx25r64;
};

aliases {
watchdog0 = &wdt0;
};
};

/* Set IPC thread priority to the highest value to not collide with other threads. */
&ipc0 {
zephyr,priority = <0 PRIO_COOP>;
};

&wdt0 {
status = "disabled";
};
3 changes: 0 additions & 3 deletions samples/matter/lock/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,3 @@ CONFIG_BOOT_BANNER=n
# Enable Factory Data feature
CONFIG_CHIP_FACTORY_DATA=y
CONFIG_CHIP_FACTORY_DATA_BUILD=y

# Enable Watchdog
CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y
4 changes: 2 additions & 2 deletions samples/matter/lock/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ tests:
sample.matter.lock.release:
sysbuild: true
build_only: true
extra_args: FILE_SUFFIX=release
extra_args: FILE_SUFFIX=release lock_SNIPPET="matter-watchdog"
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
Expand Down Expand Up @@ -90,7 +90,7 @@ tests:
sysbuild: true
build_only: true
extra_args: FILE_SUFFIX=release CONFIG_NCS_SAMPLE_MATTER_LEDS=n
CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=n
CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
integration_platforms:
- nrf54l15dk/nrf54l15/cpuapp
platform_allow: nrf54l15dk/nrf54l15/cpuapp
Expand Down
3 changes: 3 additions & 0 deletions samples/matter/smoke_co_alarm/boards/nrf52840dk_nrf52840.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,6 @@
&usbd {
status = "disabled";
};
&wdt0 {
status = "disabled";
};
Loading
Loading