Fix bug in timer_callback

renzenicolai · renzenicolai · commit 105480239677 · 2017-08-02T01:06:24.000+02:00
diff --git a/esp32/modules/splash.py b/esp32/modules/splash.py
@@ -268,13 +268,6 @@ def splash_input_init():
 
 scheduler = []
 
-loopTimerPos = 0
-loopTimerTarget = 0
-drawTimerPos = 0
-drawTimerTarget = 0
-powerTimerPos = 0
-powerTimerTarget = 0
-
 def scheduler_add(target, callback):
     global scheduler
     item = {"pos":0, "target":target, "cb":callback}
@@ -286,16 +279,13 @@ def timer_callback(tmr):
     for i in range(0, len(scheduler)):
         scheduler[i]["pos"] += 25
         if scheduler[i]["pos"] > scheduler[i]["target"]:
-            print("Target reached "+str(i))
             newTarget = scheduler[i]["cb"]()
             if newTarget > 0:
-                print("New target "+str(i))
                 newScheduler[i]["pos"] = 0
                 newScheduler[i]["target"] = newTarget
             else:
-                print("Discard "+str(i))
-                newScheduler[i]["pos"] = -1
-                newScheduler[i]["target"] = -1
+                newScheduler.pop(i)
+    scheduler = newScheduler
         
 ### PROGRAM
 
diff --git a/esp32/modules/virtualtimers.py b/esp32/modules/virtualtimers.py
@@ -0,0 +1,62 @@
+# File: virtualtimers.py
+# Version: 1
+# Description: Uses one hardware timer to simulate timers
+# License: MIT
+# Authors: Renze Nicolai <renze@rnplus.nl>
+
+scheduler = []
+timer = machine.Timer(0)
+period = 0
+
+def new(target, callback):
+    global scheduler
+    item = {"pos":0, "target":target, "cb":callback}
+    scheduler.append(item)
+    
+def delete(callback):
+    global scheduler
+    newScheduler = scheduler
+    found = False
+    for i in range(0, len(scheduler)):
+        if (scheduler[i]["cb"]==callback):
+            newScheduler.pop(i)
+            found = True
+            break
+    scheduler = newScheduler
+    return found
+
+def update(target, callback):
+    global scheduler
+    found = False
+    for i in range(0, len(scheduler)):
+        if (scheduler[i]["cb"]==callback):
+            scheduler[i]["target"] = target
+            found = True
+    return found
+
+def activate(p):
+    global timer
+    global period
+    if p<1:
+        return
+    period = p
+    timer.init(period=p, mode=machine.Timer.PERIODIC, callback=timer_callback)
+    
+def stop():
+    global timer
+    timer.deinit()
+    
+def timer_callback(tmr):
+    global scheduler
+    global period
+    newScheduler = scheduler
+    for i in range(0, len(scheduler)):
+        scheduler[i]["pos"] += period
+        if scheduler[i]["pos"] > scheduler[i]["target"]:
+            newTarget = scheduler[i]["cb"]()
+            if newTarget > 0:
+                newScheduler[i]["pos"] = 0
+                newScheduler[i]["target"] = newTarget
+            else:
+                newScheduler.pop(i)
+    scheduler = newScheduler
