Skip to content

Commit

Permalink
Merge pull request #8963 from Josar/pr/eventTimer_2
Browse files Browse the repository at this point in the history
evtimer: ticks vs ms
  • Loading branch information
miri64 committed Apr 17, 2018
2 parents 32807bd + 515027b commit 07eb208
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions sys/evtimer/evtimer.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@ static void _del_event_from_list(evtimer_t *evtimer, evtimer_event_t *event)
}
}

static void _set_timer(xtimer_t *timer, uint32_t offset)
static void _set_timer(xtimer_t *timer, uint32_t offset_ms)
{
uint64_t offset_in_us = (uint64_t)offset * 1000;
uint64_t offset_us = (uint64_t)offset_ms * 1000;

DEBUG("evtimer: now=%" PRIu32 " setting xtimer to %" PRIu32 ":%" PRIu32 "\n",
xtimer_now_usec(), (uint32_t)(offset_in_us >> 32),
(uint32_t)(offset_in_us));
_xtimer_set64(timer, offset_in_us, offset_in_us >> 32);
DEBUG("evtimer: now=%" PRIu32 " us setting xtimer to %" PRIu32 ":%" PRIu32 " us\n",
xtimer_now_usec(), (uint32_t)(offset_us >> 32), (uint32_t)(offset_us));

xtimer_set64(timer, offset_us);
}

static void _update_timer(evtimer_t *evtimer)
Expand Down

0 comments on commit 07eb208

Please sign in to comment.