Merge pull request SHA2017-badge#180 from SHA2017-badge/exceptions

renzenicolai · web-flow · commit 09d45c7494ce · 2017-08-03T19:47:41.000+02:00
Exception reporting and post OTA update script
diff --git a/esp32/modules/create.py b/esp32/modules/create.py
@@ -0,0 +1,42 @@
+import uos
+
+def boot():
+    print("Updating 'boot.py'...")
+    with open("/boot.py", "w") as f:
+            f.write("""\
+# This file is executed on every boot (including wake-boot from deepsleep)
+import badge, machine, esp, ugfx, sys
+badge.init()
+ugfx.init()
+esp.rtcmem_write(0,0)
+esp.rtcmem_write(1,0)
+splash = badge.nvs_get_str('boot','splash','splash')
+if machine.reset_cause() != machine.DEEPSLEEP_RESET:
+    print('[BOOT] Cold boot')
+else:
+    print("[BOOT] Wake from sleep")
+    load_me = esp.rtcmem_read_string()
+    if load_me:
+        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:
+    sys.print_exception(e)
+    import easydraw
+    easydraw.msg("A fatal error occured!","Still Crashing Anyway", True)
+    easydraw.msg("")
+    easydraw.msg("Guru meditation:")
+    easydraw.msg(str(e))
+    easydraw.msg("")
+    easydraw.msg("Rebooting in 5 seconds...")
+    import time
+    time.sleep(5)
+    import appglue
+    appglue.home()
+    """)
diff --git a/esp32/modules/inisetup.py b/esp32/modules/inisetup.py
@@ -3,24 +3,6 @@
 def setup():
     print("Performing initial setup")
     vfs = uos.VfsNative(True)
-    with open("/boot.py", "w") as f:
-        f.write("""\
-# This file is executed on every boot (including wake-boot from deepsleep)
-import badge, machine, esp, ugfx
-badge.init()
-ugfx.init()
-esp.rtcmem_write(0,0)
-esp.rtcmem_write(1,0)
-splash = badge.nvs_get_str('badge','boot.splash','splash')
-if machine.reset_cause() != machine.DEEPSLEEP_RESET:
-    print('[BOOT.PY] Cold boot')
-else:
-    print("[BOOT.PY] Wake from sleep")
-    load_me = esp.rtcmem_read_string()
-    if load_me:
-        splash = load_me
-        print("starting %s" % load_me)
-        esp.rtcmem_write_string("")
-__import__(splash)
-""")
+    import create
+    create.boot()
     return vfs
diff --git a/esp32/modules/post_ota.py b/esp32/modules/post_ota.py
@@ -0,0 +1,15 @@
+import badge, easydraw
+
+def u0to1():
+    import create
+    create.boot()
+    easydraw.msg("Applied patch 1")
+
+# Read current patch level
+lvl = badge.nvs_get_u8('ota', 'fixlvl', 0)
+
+if lvl<1:
+    easydraw.msg("Running post OTA scripts...","Still updating anyways...",)
+    u0to1()
+    easydraw.msg("Post OTA update completed")
+    badge.nvs_set_u8('ota', 'fixlvl', 1)
diff --git a/esp32/modules/shell.py b/esp32/modules/shell.py
@@ -0,0 +1,2 @@
+import appglue
+appglue.start_app("shell")
diff --git a/esp32/modules/splash.py b/esp32/modules/splash.py
@@ -123,6 +123,9 @@ def onSleep(idleTime):
 splash_input_init()
 splash_about_countdown_reset()
 
+# post ota script
+import post_ota
+
 setupState = badge.nvs_get_u8('badge', 'setup.state', 0)
 if setupState == 0: #First boot
     print("[SPLASH] First boot (start setup)...")
@@ -171,5 +174,5 @@ def onSleep(idleTime):
 
 print("----")
 print("WARNING: POWER MANAGEMENT ACTIVE")
-print("TO USE REPL START LAUNCHER")
+print("To use shell type 'import shell' within 5 seconds.")
 print("----")

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+import appglue`
	`2`	`+appglue.start_app("shell")`