diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-05-16 12:48:24 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-05-19 11:36:43 +0200 |
| commit | 5d96c27e2679e37bd7354d3c618a4fc3111f137c (patch) | |
| tree | e594141d553950194df5fa17df1eefe09855ef43 /CAN-binder/low-can-binding/utils | |
| parent | 732e212fd2e9c8a69c1ce692fe55af6a8d04f777 (diff) | |
Fix: compile conversion warning
Change-Id: I174c546afb6b21df431e0a61677292d43af8f0ca
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-binder/low-can-binding/utils')
| -rw-r--r-- | CAN-binder/low-can-binding/utils/timer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CAN-binder/low-can-binding/utils/timer.cpp b/CAN-binder/low-can-binding/utils/timer.cpp index a7ed558..3d90a00 100644 --- a/CAN-binder/low-can-binding/utils/timer.cpp +++ b/CAN-binder/low-can-binding/utils/timer.cpp @@ -97,7 +97,7 @@ bool frequency_clock_t::elapsed(bool stagger) last_tick_ = get_time_function()() - (rand() % int(period)); // Make sure it ticks the the first call - elapsed_time = !started() ? period : get_time_function()() - last_tick_; + elapsed_time = !started() ? period : (float)get_time_function()() - (float)last_tick_; return frequency_ == 0 || elapsed_time >= period; } |