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

Fix for Issue #6478 #6486

Merged
merged 3 commits into from
Jun 15, 2022
Merged

Fix for Issue #6478 #6486

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
015e958
Fix for Issue #6478
DavePutz Jun 14, 2022
669e454
Uncommented call to print_wakeup_cause
DavePutz Jun 14, 2022
8668dee
Fix declaration of print_wakeup_cause
DavePutz Jun 15, 2022
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 ports/nrf/boards/clue_nrf52840_express/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,5 @@ void reset_board(void) {
}

void board_deinit(void) {
common_hal_displayio_release_displays();
}
5 changes: 4 additions & 1 deletion ports/nrf/common-hal/alarm/__init__.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
#include "nrf_power.h"
#include "nrfx.h"
#include "nrfx_gpiote.h"
#ifdef NRF_DEBUG_PRINT
static void print_wakeup_cause(nrf_sleep_source_t cause);
#endif
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I should have been more specific. The function below can be static and then this bit isn't needed.


// Singleton instance of SleepMemory.
const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = {
Expand Down Expand Up @@ -108,7 +111,7 @@ bool common_hal_alarm_woken_from_sleep(void) {
nrf_sleep_source_t cause = _get_wakeup_cause();
#ifdef NRF_DEBUG_PRINT
if (cause != NRF_SLEEP_WAKEUP_UNDEFINED) {
// print_wakeup_cause(cause);
print_wakeup_cause(cause);
}
#endif
return cause == NRF_SLEEP_WAKEUP_GPIO || cause == NRF_SLEEP_WAKEUP_TIMER
Expand Down