Set interval when no service does it.

renzenicolai · renzenicolai · commit 25f8c8ea431a · 2017-08-01T02:32:18.000+02:00
diff --git a/esp32/modules/services.py b/esp32/modules/services.py
@@ -168,6 +168,10 @@ def loop_timer_callback(tmr):
     loopCallbacks = newLoopCallbacks
     del(newLoopCallbacks)
     
+    if requestedInterval>=99999999:
+        print("[SERVICES] No loop interval returned.")
+        requestedInterval = -1
+    
     try:
         if pmCallback(requestedInterval):
             print("[SERVICES] Loop timer (re-)started")
@@ -204,7 +208,11 @@ def draw_timer_callback(tmr):
     
     badge.eink_busy_wait()
     
-    if len(drawCallbacks)>0:
+    if requestedInterval>=99999999:
+        print("[SERVICES] No draw interval returned.")
+        requestedInterval = -1
+    
+    if len(drawCallbacks)>0 and requestedInterval>=0:
         print("[SERVICES] New draw requested in "+str(requestedInterval)+".")
         tmr.init(period=requestedInterval*1000, mode=machine.Timer.ONE_SHOT, callback=draw_timer_callback) 
        
diff --git a/esp32/modules/splash.py b/esp32/modules/splash.py
@@ -56,12 +56,12 @@ def power_countdown_callback(tmr):
     global requestedStandbyTime
     if requestedStandbyTime>0:
         if enableBpp:
-            print("[PM] BPP for "+str(round(requestedStandbyTime/60))+" minutes.")
+            print("[PM] BPP for "+str(requestedStandbyTime)+" seconds.")
             #appglue.start_bpp(round(requestedStandbyTime/60)) #BPP needs time in minutes
-            deepsleep.start_sleeping(requestedStandbyTime*1000)
+            deepsleep.start_sleeping(requestedStandbyTime)
         else:
             print("[PM] Sleep for "+str(round())+" seconds.")
-            deepsleep.start_sleeping(requestedStandbyTime*1000) #Sleep needs time in milliseconds
+            deepsleep.start_sleeping(requestedStandbyTime)
     else:
             print("[PM] BPP forever.")
             #appglue.start_bpp(-1)
