src:arduino-timer: ticks() function

Split the ticks calculation into a separate function.

Fixes issue of invalid tick value when adding a task from within a task.
If the task ends up in an earlier slot, its expiration is not handled.
Post-processing the ticks avoids the issue.

Author: contrem

src/arduino-timer.h

@@ -99,6 +99,29 @@ class Timer {
     /* Ticks the timer forward - call this function in loop() */
     unsigned long
     tick()
+    {
+        for (size_t i = 0; i < max_tasks; ++i) {
+            struct task * const task = &tasks[i];
+
+            if (task->handler) {
+                const unsigned long t = time_func();
+                const unsigned long duration = t - task->start;
+
+                if (duration >= task->expires) {
+                    task->repeat = task->handler(task->opaque) && task->repeat;
+
+                    if (task->repeat) task->start = t;
+                    else remove(task);
+                }
+            }
+        }
+
+        return ticks();
+    }
+
+    /* Ticks until the next event */
+    unsigned long
+    ticks()
     {
         unsigned long ticks = (unsigned long)-1, elapsed;
         const unsigned long start = time_func();
@@ -111,12 +134,8 @@ class Timer {
                 const unsigned long duration = t - task->start;
 
                 if (duration >= task->expires) {
-                    task->repeat = task->handler(task->opaque) && task->repeat;
-
-                    if (task->repeat) {
-                        task->start = t;
-                        ticks = task->expires < ticks ? task->expires : ticks;
-                    } else remove(task);
+                    ticks = 0;
+                    break;
                 } else {
                     const unsigned long remaining = task->expires - duration;
                     ticks = remaining < ticks ? remaining : ticks;