Merge pull request #146 from ros2/fix_timer

Change behavior of timer on construction
ros2 · Nov 6, 2015 · 361faf6 · 361faf6
2 parents ca64af3 + dcd5117
commit 361faf6
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/rclcpp/include/rclcpp/timer.hpp b/rclcpp/include/rclcpp/timer.hpp
@@ -97,9 +97,8 @@ class GenericTimer : public TimerBase
   GenericTimer(std::chrono::nanoseconds period, CallbackType callback)
   : TimerBase(period, callback), loop_rate_(period)
   {
-    /* Subtracting the loop rate period ensures that the callback gets triggered
-       on the first call to check_and_trigger. */
-    last_triggered_time_ = Clock::now() - period;
+    /* Set last_triggered_time_ so that the timer fires at least one period after being created. */
+    last_triggered_time_ = Clock::now();
   }
 
   /// Default destructor.