RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

evtimer: bug ms vs ticks resolved

Browse Source
This commit is contained in:
Josarn 2018-04-11 15:27:26 +02:00
parent d627bcd305
commit 6f75dff1de
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/evtimer/evtimer.c
View File

@ -1,6 +1,7 @@
/* /*
* Copyright (C) 2016-17 Kaspar Schleiser <kaspar@schleiser.de> * Copyright (C) 2016-17 Kaspar Schleiser <kaspar@schleiser.de>
* 2017 Freie Universität Berlin * 2017 Freie Universität Berlin
* 2018 Josua Arndt
* *
* This file is subject to the terms and conditions of the GNU Lesser * This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level * General Public License v2.1. See the file LICENSE in the top level
@ -16,6 +17,7 @@
* *
* @author Kaspar Schleiser <kaspar@schleiser.de> * @author Kaspar Schleiser <kaspar@schleiser.de>
* @author Martine Lenders <m.lenders@fu-berlin.de> * @author Martine Lenders <m.lenders@fu-berlin.de>
* @author Josua Arndt <jarndt@ias.rwth-aachen.de>
* *
* @} * @}
*/ */
@ -102,16 +104,17 @@ static void _update_timer(evtimer_t *evtimer)
static uint32_t _get_offset(xtimer_t *timer) static uint32_t _get_offset(xtimer_t *timer)
{ {
uint64_t now = xtimer_now_usec64(); uint64_t now_us = xtimer_now_usec64();
uint64_t target = ((uint64_t)timer->long_target) << 32 | timer->target; uint64_t target_us = _xtimer_usec_from_ticks64(
((uint64_t)timer->long_target) << 32 | timer->target);
if (target <= now) { if (target_us <= now_us) {
return 0; return 0;
} }
else { else {
target -= now; target_us -= now_us;
/* add half of 125 so integer division rounds to nearest */ /* add half of 125 so integer division rounds to nearest */
return div_u64_by_125((target >> 3) + 62); return div_u64_by_125((target_us >> 3) + 62);
} }
} }