Merge pull request #2410 from pan-/fix_nrf51_os_tick

0xc0170 · web-flow · commit fca16f80e7e7 · 2016-08-11T09:03:23.000+01:00
Fix possible overflow of NRF51 os tick.
diff --git a/hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/us_ticker.c b/hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/us_ticker.c
@@ -474,7 +474,7 @@ static void register_next_tick() {
     uint32_t current_counter = nrf_rtc_counter_get(COMMON_RTC_INSTANCE);
 
     // If an overflow occur, set the next tick in COUNTER + delta clock cycles
-    if (is_in_wrapped_range(previous_tick_cc_value, new_compare_value, current_counter) == false) {
+    if (is_in_wrapped_range(previous_tick_cc_value, new_compare_value, current_counter + 1) == false) {
         new_compare_value = current_counter + delta;
     }
     nrf_rtc_cc_set(COMMON_RTC_INSTANCE, OS_TICK_CC_CHANNEL, new_compare_value);

Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ static void register_next_tick() {`
`474`	`474`	`uint32_t current_counter = nrf_rtc_counter_get(COMMON_RTC_INSTANCE);`
`475`	`475`
`476`	`476`	`// If an overflow occur, set the next tick in COUNTER + delta clock cycles`
`477`		`- if (is_in_wrapped_range(previous_tick_cc_value, new_compare_value, current_counter) == false) {`
	`477`	`+ if (is_in_wrapped_range(previous_tick_cc_value, new_compare_value, current_counter + 1) == false) {`
`478`	`478`	`new_compare_value = current_counter + delta;`
`479`	`479`	`}`
`480`	`480`	`nrf_rtc_cc_set(COMMON_RTC_INSTANCE, OS_TICK_CC_CHANNEL, new_compare_value);`