Remove Alarm from small boards

hierophect · hierophect · commit a1dc423569c9 · 2021-04-20T17:20:53.000-04:00
diff --git a/ports/nrf/boards/pca10100/mpconfigboard.mk b/ports/nrf/boards/pca10100/mpconfigboard.mk
@@ -7,6 +7,7 @@ MCU_CHIP = nrf52833
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
+CIRCUITPY_ALARM = 0
 CIRCUITPY_AUDIOMP3 = 0
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_BITMAPTOOLS = 0
diff --git a/ports/nrf/boards/simmel/mpconfigboard.mk b/ports/nrf/boards/simmel/mpconfigboard.mk
@@ -10,6 +10,7 @@ MCU_CHIP = nrf52833
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
+CIRCUITPY_ALARM = 0
 CIRCUITPY_AESIO = 1
 CIRCUITPY_AUDIOMP3 = 0
 CIRCUITPY_BITMAPTOOLS = 0
diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk
@@ -47,7 +47,7 @@ CIRCUITPY_COUNTIO = 0
 CIRCUITPY_WATCHDOG ?= 1
 
 # Sleep and Wakeup
-CIRCUITPY_ALARM = 1
+CIRCUITPY_ALARM ?= 1
 
 # nRF52840-specific
 
diff --git a/ports/nrf/supervisor/port.c b/ports/nrf/supervisor/port.c
@@ -108,7 +108,9 @@ void rtc_handler(nrfx_rtc_int_type_t int_type) {
         nrfx_rtc_cc_set(&rtc_instance, 0, 0, false);
     } else if (int_type == NRFX_RTC_INT_COMPARE1) {
         // used in light sleep
+        #if CIRCUITPY_ALARM
         sleepmem_wakeup_event = SLEEPMEM_WAKEUP_BY_TIMER;
+        #endif
         nrfx_rtc_cc_set(&rtc_instance, 1, 0, false);
     }
 }
@@ -184,7 +186,9 @@ safe_mode_t port_init(void) {
     NRF_POWER->RESETREAS = reset_reason_saved;
     // clear wakeup event/pin when reset by reset-pin
     if (reset_reason_saved & NRF_POWER_RESETREAS_RESETPIN_MASK) {
+        #if CIRCUITPY_ALARM
         sleepmem_wakeup_event = SLEEPMEM_WAKEUP_BY_NONE;
+        #endif
     }
 
     // If the board was reset by the WatchDogTimer, we may

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,9 @@ void rtc_handler(nrfx_rtc_int_type_t int_type) {`
`108`	`108`	`nrfx_rtc_cc_set(&rtc_instance, 0, 0, false);`
`109`	`109`	`} else if (int_type == NRFX_RTC_INT_COMPARE1) {`
`110`	`110`	`// used in light sleep`
	`111`	`+ #if CIRCUITPY_ALARM`
`111`	`112`	`sleepmem_wakeup_event = SLEEPMEM_WAKEUP_BY_TIMER;`
	`113`	`+ #endif`
`112`	`114`	`nrfx_rtc_cc_set(&rtc_instance, 1, 0, false);`
`113`	`115`	`}`
`114`	`116`	`}`
`@@ -184,7 +186,9 @@ safe_mode_t port_init(void) {`
`184`	`186`	`NRF_POWER->RESETREAS = reset_reason_saved;`
`185`	`187`	`// clear wakeup event/pin when reset by reset-pin`
`186`	`188`	`if (reset_reason_saved & NRF_POWER_RESETREAS_RESETPIN_MASK) {`
	`189`	`+ #if CIRCUITPY_ALARM`
`187`	`190`	`sleepmem_wakeup_event = SLEEPMEM_WAKEUP_BY_NONE;`
	`191`	`+ #endif`
`188`	`192`	`}`
`189`	`193`
`190`	`194`	`// If the board was reset by the WatchDogTimer, we may`