Skip to content

manifest: sdk-zephyr: [nrf fromtree] samples: boards: nrf: system_off: Print reset reason. #20986

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

Merged
merged 3 commits into from
Mar 21, 2025
Merged

manifest: sdk-zephyr: [nrf fromtree] samples: boards: nrf: system_off: Print reset reason. #20986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58e8d85
manifest: Update sdk-zephyr revision (auto-manifest PR)
NordicBuilder Mar 18, 2025
1ee86a1
samples: benchmarks: current_consumption: system_off
nordic-babu Mar 20, 2025
d875a39
samples: zephyr: system_off
nordic-babu Mar 20, 2025
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
1 change: 1 addition & 0 deletions samples/zephyr/boards/nordic/system_off/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CONFIG_PM_DEVICE=y
CONFIG_GPIO=y
CONFIG_HWINFO=y
CONFIG_CRC=y
CONFIG_POWEROFF=y
2 changes: 2 additions & 0 deletions samples/zephyr/boards/nordic/system_off/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ tests:
- "Retained data not supported"
- "Entering system off; wait 2 seconds to restart"
- "system off demo"
- "Wakeup from System OFF by GRTC."
- "Retained data not supported"
- "Entering system off; wait 2 seconds to restart"
nrf.extended.sample.boards.nrf.system_off.retained_mem.grtc_wakeup:
Expand All @@ -81,3 +82,4 @@ tests:
- "Off count: 1"
- "Active Ticks:"
- "Entering system off; wait 2 seconds to restart"
- "Wakeup from System OFF by GRTC."
1 change: 1 addition & 0 deletions tests/benchmarks/current_consumption/system_off/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CONFIG_PM_DEVICE=y
CONFIG_GPIO=y
CONFIG_HWINFO=y
CONFIG_CRC=y
CONFIG_POWEROFF=y
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 7684f5879a4373cff03f8f3abf4378ec8643cadf
revision: fbc220f29bdeb98b68fa83426fa936ceb6e6ffd9
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading