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

nRF system reset is disabled for rev 5 and above now #343

Merged
merged 1 commit into from
Aug 8, 2024
Merged

nRF system reset is disabled for rev 5 and above now #343

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
2 changes: 0 additions & 2 deletions app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ CONFIG_DEBUG_COREDUMP_BACKEND_OTHER=y
CONFIG_RTC=y
CONFIG_RTC_UPDATE=y

CONFIG_MISC_ENABLE_SYSTEM_RESET=n # Implemented in nPM, hence not needed in FW

# Save som flash temporary
CONFIG_APPLICATIONS_USE_QR_CODE=n
CONFIG_APPLICATIONS_USE_X_RAY=n
2 changes: 1 addition & 1 deletion app/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ static void run_input_work(struct k_work *item)
switch (container->event.code) {
// Button event
case (INPUT_KEY_Y): {
#ifdef CONFIG_MISC_ENABLE_SYSTEM_RESET
#if(CONFIG_MISC_ENABLE_SYSTEM_RESET && (CONFIG_ZSWATCH_PCB_REV < 5))
LOG_INF("Force restart");

retained.off_count += 1;
Expand Down