Merge pull request SHA2017-badge#185 from SHA2017-badge/new_draw_argument

annejan · web-flow · commit a3bbb83dce4d · 2017-08-05T01:35:14.000+02:00
Add a new optional argument to the draw() function in a service, whic…
diff --git a/esp32/modules/tasks/services.py b/esp32/modules/tasks/services.py
@@ -137,7 +137,10 @@ def draw_task():
         rqi = 0
         try:
             cb = drawCallbacks[i].draw
-            [rqi, space_used] = cb(y)
+	    try:
+		[rqi, space_used] = cb(y, False)
+	    except:
+		[rqi, space_used] = cb(y)
             y = y - space_used
         except BaseException as e:
             print("[SERVICES] Exception in service draw:")
@@ -188,7 +191,10 @@ def force_draw(goingToSleep=False):
                         cb = srv.draw_going_to_sleep
                     except:
                         cb = srv.draw
-                [rqi, space_used] = cb(y)
+		try:
+		    [rqi, space_used] = cb(y, True)
+		except:
+		    [rqi, space_used] = cb(y)
                 y = y - space_used
             except BaseException as e:
                 print("[SERVICES] Exception in service draw: ")
