Merge pull request SHA2017-badge#116 from SHA2017-badge/rstd-batterymanagement

Roosted7 · web-flow · commit 3d81d93bedf3 · 2017-07-26T01:15:39.000+02:00
Major python code change
diff --git a/esp32/modules/_boot.py b/esp32/modules/_boot.py
@@ -3,7 +3,6 @@
 try:
     uos.mount(uos.VfsNative(True), '/')
     open("/boot.py", "r")
-
 except OSError:
     import inisetup
     vfs = inisetup.setup()
diff --git a/esp32/modules/appglue.py b/esp32/modules/appglue.py
@@ -1,13 +1,14 @@
 import ugfx, esp, badge, deepsleep
 
-def start_app(app):
-    ugfx.clear(ugfx.WHITE)
-    ugfx.string(0, 0, "Please wait...", "PermanentMarker22", ugfx.BLACK)
-    if (app==""):
-        ugfx.string(0,  25, "Returning to homescreen...","Roboto_Regular12",ugfx.BLACK)
-    else:
-        ugfx.string(0,  25, "Starting "+app+"...","Roboto_Regular12",ugfx.BLACK)
-    ugfx.flush()
+def start_app(app, display = True):
+    if display:
+        ugfx.clear(ugfx.WHITE)
+        ugfx.string(0, 0, "Loading...", "PermanentMarker22", ugfx.BLACK)
+        if app:
+            ugfx.string(0,  25, "Starting "+app+"...","Roboto_Regular12",ugfx.BLACK)
+        else:
+            ugfx.string(0,  25, "Returning to homescreen...","Roboto_Regular12",ugfx.BLACK)
+        ugfx.flush(ugfx.LUT_FASTER)
     esp.rtcmem_write_string(app)
     badge.eink_busy_wait()
     deepsleep.reboot()
diff --git a/esp32/modules/deepsleep.py b/esp32/modules/deepsleep.py
@@ -1,11 +1,11 @@
-import machine as m
+import machine
 
-p = m.Pin(25)
-r = m.RTC()
-r.wake_on_ext0(pin = p, level = 0)
+pin = machine.Pin(25)
+rtc = machine.RTC()
+rtc.wake_on_ext0(pin = pin, level = 0)
 
 def start_sleeping(time=0):
-    m.deepsleep(time)
+    machine.deepsleep(time)
 
 def reboot():
-    m.deepsleep(1)
+    machine.deepsleep(1)
diff --git a/esp32/modules/inisetup.py b/esp32/modules/inisetup.py
@@ -11,17 +11,16 @@ def setup():
 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("cold boot")
-    import splash
+    print('[BOOT.PY] Cold boot')
 else:
-    print("wake from sleep")
+    print("[BOOT.PY] Wake from sleep")
     load_me = esp.rtcmem_read_string()
-    if load_me != "":
+    if load_me:
+        splash = load_me
         print("starting %s" % load_me)
         esp.rtcmem_write_string("")
-        __import__(load_me)
-    else:
-        import splash
+__import__(splash)
 """)
     return vfs
diff --git a/esp32/modules/services.py b/esp32/modules/services.py
@@ -0,0 +1,57 @@
+import uos
+
+# SHA2017 badge services
+#   Renze Nicolai
+#   Thomas Roos
+
+def setup():
+    global services
+    try:
+        apps = uos.listdir('lib')
+    except OSError:
+        print("[SERVICES] Can't setup services: no lib folder!")
+        return False
+    found = False
+    for app in apps:
+        try:
+            files = uos.listdir('lib/'+app)
+        except OSError:
+            print("[SERVICES] Listing app files for app '"+app+"' failed!")
+
+        for f in files:
+            if (f=="service.py"):
+                found = True
+                print("[SERVICES] Found service "+app+"...")
+                try:
+                    srv = __import__('lib/'+app+'/service')
+                    services.append(srv) #Add to global list
+                    srv.setup()
+                except BaseException as msg:
+                    print("Exception in service setup "+app+": ", msg)
+                break
+    return found
+
+def loop(lcnt):
+    noSleep = False
+    global services
+    for srv in services:
+        try:
+            if (srv.loop(lcnt)):
+                noSleep = True
+        except BaseException as msg:
+            print("[SERVICES] Service loop exception: ", msg)
+    return noSleep
+
+def draw():
+    global services
+    x = 0
+    y = 114
+    for srv in services:
+        try:
+            space_used = srv.draw(x,y)
+            if (space_used>0):
+                y = y - abs(space_used)
+        except BaseException as msg:
+            print("[SERVICES] Service draw exception: ", msg)
+
+services = []
diff --git a/esp32/modules/splash.py b/esp32/modules/splash.py
