Removed all the pops

renzenicolai · renzenicolai · commit 9f6c61f490e0 · 2017-08-02T04:59:48.000+02:00
diff --git a/esp32/modules/badge_event_reminder.py b/esp32/modules/badge_event_reminder.py
@@ -5,10 +5,13 @@ def exit(p):
         appglue.home()
 
 ugfx.clear(ugfx.WHITE)
-ugfx.string(0, 0, "Message here!", "PermanentMarker22", ugfx.BLACK)
-ugfx.string(0, 25, "Hello wolrd", "Roboto_Regular12", ugfx.BLACK)
-ugfx.string(0, 25+13, "Nothing here yet!", "Roboto_Regular12", ugfx.BLACK)
+ugfx.string(0, 0, "SHA2017 Badge", "PermanentMarker22", ugfx.BLACK)
+ugfx.string(0, 25, "Please join us for a short talk on how the", "Roboto_Regular12", ugfx.BLACK)
+ugfx.string(0, 25+13, "official SHA2017 badge was designed,", "Roboto_Regular12", ugfx.BLACK)
+ugfx.string(0, 25+13*2, "some nice numbers and an overview of what all", "Roboto_Regular12", ugfx.BLACK)
+ugfx.string(0, 25+13*3, "of you are doing with it.", "Roboto_Regular12", ugfx.BLACK)
 
+ugfx.string(0, 25+13*5, "The events starts now, in room 'No'!", "Roboto_Regular12", ugfx.BLACK)
 ugfx.string(0, ugfx.height()-13, "Press any key to close reminder.", "Roboto_Regular12", ugfx.BLACK)
 ugfx.set_lut(ugfx.LUT_FULL)
 ugfx.flush()
diff --git a/esp32/modules/tasks/services.py b/esp32/modules/tasks/services.py
@@ -134,9 +134,8 @@ def draw_task():
     
     drawCallback(False) # Prepare draw
     
-    newDrawCallbacks = []
-    for cbs in drawCallbacks:
-        newDrawCallbacks.append(cbs)
+    deleted = []
+
     for i in range(0, len(drawCallbacks)):
         cb = drawCallbacks[i]
         rqi = 0
@@ -146,16 +145,18 @@ def draw_task():
         except BaseException as e:
             print("[SERVICES] Exception in service draw:")
             sys.print_exception(e)
-            newDrawCallbacks.pop(i)
+            deleted.append(cb)
             continue
         if rqi>0 and rqi<requestedInterval:
             # Service wants to loop again in rqi ms
             requestedInterval = rqi
         elif rqi<=0:
             # Service doesn't want to draw again until next wakeup
-            newDrawCallbacks.pop(i)
-    drawCallbacks = newDrawCallbacks
-    del(newDrawCallbacks)
+            deleted.append(cb)
+    
+    for i in range(0,len(deleted)):
+        print("[DEBUG] Deleted draw callback: ",dcb)
+        drawCallbacks = tuple(dcb for dcb in drawCallbacks if dcb!=deleted[i])
     
     badge.eink_busy_wait()
     
diff --git a/esp32/modules/virtualtimers.py b/esp32/modules/virtualtimers.py
@@ -53,16 +53,15 @@ def pm_time():
     
 def delete(callback):
     global scheduler
-    newScheduler = []
-    for task in scheduler:
-        newScheduler.append(task)
+    
     found = False
     for i in range(0, len(scheduler)):
         if (scheduler[i]["cb"]==callback):
-            newScheduler.pop(i)
             found = True
             break
-    scheduler = newScheduler
+    
+    scheduler = tuple(task for task in scheduler if task['cb']!=callback)
+    
     return found
 
 def update(target, callback):
@@ -86,14 +85,10 @@ def activate(p):
 def stop():
     global timer
     timer.deinit()
-    
+        
 def timer_callback(tmr):
     global scheduler
-    global period
-    newScheduler = []
-    for task in scheduler:
-        newScheduler.append(task)
-    
+    global period    
     s = len(scheduler)
     for i in range(0, len(scheduler)):
         scheduler[i]["pos"] += period
@@ -105,11 +100,10 @@ def timer_callback(tmr):
                 sys.print_exception(e)
                 newTarget = -1
             if newTarget > 0:
-                newScheduler[i]["pos"] = 0
-                newScheduler[i]["target"] = newTarget
+                scheduler[i]["pos"] = 0
+                scheduler[i]["target"] = newTarget
             else:
-                try:
-                    newScheduler.pop(i)
-                except:
-                    print("CAN NOT REMOVE TASK ?!?!")
-    scheduler = newScheduler
+                scheduler[i]["pos"] = -1
+                scheduler[i]["target"] = -1
+                
+    scheduler = tuple(task for task in scheduler if task["pos"]>=0)
