Merge pull request #11123 from desmond-blue/fix-nrf52-us-ticker-free

Seppo Takalo · web-flow · commit 6436f1133502 · 2019-08-06T11:33:55.000+03:00
NRF52 need to call TIMER_TASK_SHUTDOWN for current consumption
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/us_ticker.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/us_ticker.c
@@ -141,6 +141,7 @@ void us_ticker_clear_interrupt(void)
 void us_ticker_free(void)
 {
     nrf_timer_task_trigger(NRF_TIMER1, NRF_TIMER_TASK_STOP);
+    nrf_timer_task_trigger(NRF_TIMER1, NRF_TIMER_TASK_SHUTDOWN);
     nrf_timer_int_disable(NRF_TIMER1, nrf_timer_compare_int_get(NRF_TIMER_CC_CHANNEL0));
     NVIC_DisableIRQ(TIMER1_IRQn);
     us_ticker_initialized = false;

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,7 @@ void us_ticker_clear_interrupt(void)`
`141`	`141`	`void us_ticker_free(void)`
`142`	`142`	`{`
`143`	`143`	`nrf_timer_task_trigger(NRF_TIMER1, NRF_TIMER_TASK_STOP);`
	`144`	`+ nrf_timer_task_trigger(NRF_TIMER1, NRF_TIMER_TASK_SHUTDOWN);`
`144`	`145`	`nrf_timer_int_disable(NRF_TIMER1, nrf_timer_compare_int_get(NRF_TIMER_CC_CHANNEL0));`
`145`	`146`	`NVIC_DisableIRQ(TIMER1_IRQn);`
`146`	`147`	`us_ticker_initialized = false;`