Merge pull request SHA2017-badge#223 from SHA2017-badge/basvs-alternative-splash-recovery

basvs · web-flow · commit d24e2d9818cd · 2017-08-16T21:14:03.000+02:00
when the splash screen doesn't start, revert to default splash screen.
diff --git a/esp32/modules/boot.py b/esp32/modules/boot.py
@@ -14,6 +14,7 @@
     splash = 'splash'
 else:
     splash = badge.nvs_get_str('boot','splash','splash')
+
 if machine.reset_cause() != machine.DEEPSLEEP_RESET:
     print('[BOOT] Cold boot')
 else:
@@ -23,13 +24,19 @@
         splash = load_me
         print("starting %s" % load_me)
         esp.rtcmem_write_string("")
+
 try:
     if not splash=="shell":
         __import__(splash)
     else:
         ugfx.clear(ugfx.WHITE)
         ugfx.flush(ugfx.LUT_FULL)
 except BaseException as e:
+    # if we started the splash screen and it is not the default splash screen,
+    # then revert to original splash screen.
+    if splash == badge.nvs_get_str('boot', 'splash', 'splash') and splash != 'splash':
+        badge.nvs_erase_key('boot', 'splash')
+
     sys.print_exception(e)
     import easydraw
     easydraw.msg("A fatal error occured!","Still Crashing Anyway", True)
