Fix: compile conversion warning

[apps/low-level-can-service.git] / CAN-binder / low-can-binding / utils / timer.cpp

diff --git a/CAN-binder/low-can-binding/utils/timer.cpp b/CAN-binder/low-can-binding/utils/timer.cpp
index 8c6215b..3d90a00 100644 (file)
--- a/CAN-binder/low-can-binding/utils/timer.cpp
+++ b/CAN-binder/low-can-binding/utils/timer.cpp
@@ -57,20 +57,23 @@ frequency_clock_t::frequency_clock_t()
 
 frequency_clock_t::frequency_clock_t(float frequency)
        : unit_{1000000}, frequency_{frequency}, last_tick_{0}, time_function_{nullptr}
-{}
+{
+       if(frequency_ <= 0)
+               frequency_ = 1;
+}
 
 /// @brief Return the period in ms given the frequency in hertz.
 /// @param[in] frequency - Frequency to convert, in hertz
-float frequency_clock_t::frequency_to_period()
+float frequency_clock_t::frequency_to_period() const
 {
-       return frequency_ == 0 ? 0 : 1 / frequency_ * unit_;
+       return frequency_ == 0 ? 0 : 1 / frequency_;
 }
 
 const struct timeval frequency_clock_t::get_timeval_from_period() const
 {
        struct timeval freq = {0, 0};
        float f;
-       freq.tv_usec = (long int)std::modf(frequency_, &f);
+       freq.tv_usec = (long int)(std::modf(frequency_to_period(), &f) * unit_);
        freq.tv_sec = (time_t)f;
 
        return freq;
@@ -94,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;
 }