Merge pull request SHA2017-badge#165 from SHA2017-badge/services-interval-in-ms

renzenicolai · web-flow · commit 6ac29106fe20 · 2017-08-02T00:52:16.000+02:00
Add nice change by raboof
diff --git a/esp32/modules/services.py b/esp32/modules/services.py
@@ -6,7 +6,7 @@
 # Authors: Renze Nicolai <renze@rnplus.nl>
 #          Thomas Roos   <?>
 
-import uos, ujson, easywifi, easyrtc, time, appglue, deepsleep, ugfx, badge, machine
+import uos, ujson, easywifi, easyrtc, time, appglue, deepsleep, ugfx, badge, machine, sys
 
 services = [] #List containing all the service objects
 loopCallbacks = {} #Dict containing: {<FUNCTION>:<Wifi required on next run>}
@@ -85,8 +85,9 @@ def setup(pmCb=None, drawCb=None):
         # Import the service.py script
         try:
             srv = __import__('lib/'+app+'/service')
-        except BaseException as msg:
-            print("[SERVICES] Could not import service of app "+app+": ", msg)
+        except BaseException as e:
+            print("[SERVICES] Could not import service of app "+app+": ")
+            sys.print_exception(e)
             continue #Skip the app
         
         if wifiInSetup:
@@ -109,8 +110,9 @@ def setup(pmCb=None, drawCb=None):
         
         try:
             srv.setup()
-        except BaseException as msg:
-            print("[SERVICES] Exception in service setup "+app+": ", msg)
+        except BaseException as e:
+            print("[SERVICES] Exception in service setup "+app+":")
+            sys.print_exception(e)
             continue
         
         if loopEnabled:
@@ -157,8 +159,9 @@ def loop_timer():
         rqi = 0
         try:
             rqi = cb()
-        except BaseException as msg:
-            print("[SERVICES] Exception in service loop: ", msg)
+        except BaseException as e:
+            print("[SERVICES] Exception in service loop:")
+            sys.print_exception(e)
             newLoopCallbacks.pop(cb)
             continue
         if rqi>0 and rqi<requestedInterval:
@@ -200,8 +203,9 @@ def draw_timer():
         try:
             [rqi, space_used] = cb(y)
             y = y - space_used
-        except BaseException as msg:
-            print("[SERVICES] Exception in service draw: ", msg)
+        except BaseException as e:
+            print("[SERVICES] Exception in service draw:")
+            sys.print_exception(e)
             newDrawCallbacks.pop(i)
             continue
         if rqi>0 and rqi<requestedInterval:
@@ -242,5 +246,6 @@ def force_draw(disableTimer):
             try:
                 [rqi, space_used] = cb(y)
                 y = y - space_used
-            except BaseException as msg:
-                print("[SERVICES] Exception in service draw: ", msg)
+            except BaseException as e:
+                print("[SERVICES] Exception in service draw: ")
+                sys.print_exception(e)
diff --git a/esp32/modules/splash.py b/esp32/modules/splash.py
@@ -60,7 +60,7 @@ def power_countdown_callback():
             print("[PM] Sleep for "+str(requestedStandbyTime)+" ms.")
             deepsleep.start_sleeping(requestedStandbyTime)
     else:
-            print("[PM] BPP forever.")
+            print("[PM] Sleep forever.")
             deepsleep.start_sleeping()
 
 # Graphics
