Merge branch 'master' into basvs-eink-busy-wait

basvs · web-flow · commit 376640095357 · 2018-03-06T21:11:29.000+01:00
diff --git a/esp32/modugfx.c b/esp32/modugfx.c
@@ -894,7 +894,10 @@ STATIC mp_obj_t ugfx_demo(mp_obj_t hacking) {
 #ifdef UNIX
   mp_hal_delay_ms(EMU_EINK_SCREEN_DELAY_MS);
 #endif
+  uint8_t target_lut_backup = target_lut;
+  target_lut = 0xff;
   gdispFlush();
+  target_lut = target_lut_backup;
 
   return mp_const_none;
 }
diff --git a/esp32/modules/splash.py b/esp32/modules/splash.py
@@ -20,7 +20,7 @@
 def draw(mode, goingToSleep=False):
     if mode:
         # We flush the buffer and wait
-        ugfx.flush(ugfx.LUT_FULL)
+        ugfx.flush(ugfx.GREYSCALE)
     else:
         # We prepare the screen refresh
         ugfx.clear(ugfx.WHITE)
@@ -162,16 +162,20 @@ def onSleep(idleTime):
 if not easywifi.failure():
     spoc.show(False)    # Check sponsors
 
-if not badge.safe_mode():
-    services.setup(draw) # Start services
-
-draw(False)
-services.force_draw()
-draw(True)
+if badge.safe_mode():
+    draw(False)
+    services.force_draw()
+    draw(True)
+else:
+    have_services = services.setup(draw) # Start services
+    if not have_services:
+        draw(False)
+        services.force_draw()
+        draw(True)
 
 easywifi.disable()
 gc.collect()
-    
+
 virtualtimers.activate(25)
 pm.callback(onSleep)
 pm.feed()
diff --git a/esp32/modules/tasks/services.py b/esp32/modules/tasks/services.py
@@ -27,7 +27,7 @@ def setup(drawCb=None):
     try:
         apps = uos.listdir('lib')
     except OSError:
-        return [False, False]
+        return False
     
     #For each app...
     for app in apps:
