Allow wifi settings for service to work.

renzenicolai · renzenicolai · commit ede709ba1021 · 2017-08-01T03:21:46.000+02:00
diff --git a/esp32/modules/easyrtc.py b/esp32/modules/easyrtc.py
@@ -7,8 +7,11 @@
 import machine, time
 
 # Functions
-def string(date=False, time=True):
-    [year, month, mday, wday, hour, min, sec, usec] = machine.RTC().datetime()
+def string(print_date=False, print_time=True, timestamp = -1):
+    if timestamp<0:
+        [year, month, mday, wday, hour, minute, sec, usec] = machine.RTC().datetime()
+    else:
+        [year, month, mday, hour, minute, second, wday, yday] = time.localtime(timestamp)
     monthstr = str(month)
     if (month<10):
       monthstr = "0"+monthstr
@@ -18,15 +21,15 @@ def string(date=False, time=True):
     hourstr = str(hour)
     if (hour<10):
       hourstr = "0"+hourstr
-    minstr = str(min)
-    if (min<10):
+    minstr = str(minute)
+    if (minute<10):
       minstr = "0"+minstr 
     output = ""
-    if date:
+    if print_date:
         output += daystr+"-"+monthstr+"-"+str(year)
         if time:
             output += " "
-    if time:
+    if print_time:
         output += hourstr+":"+minstr
     return output
 
diff --git a/esp32/modules/services.py b/esp32/modules/services.py
@@ -115,7 +115,7 @@ def setup(pmCb=False, drawCb=False):
         
         if loopEnabled:
             try:
-                loopCallbacks[srv.loop] = 0
+                loopCallbacks[srv.loop] = wifiInLoop
             except:
                 print("[SERVICES] Loop requested but not defined in service "+app)
             
@@ -152,6 +152,14 @@ def loop_timer_callback(tmr):
     requestedInterval = 99999999
     newLoopCallbacks = loopCallbacks
     for cb in loopCallbacks:
+        if loopCallbacks[cb]:
+            print("[SERVICES] Loop needs wifi!")
+            if not easywifi.status():
+                if not easywifi.enable():
+                    print("[SERVICES] Wifi not available!")
+                    continue
+        else:
+            print("[SERVICES] Loop does not need wifi!")
         rqi = 0
         try:
             rqi = cb()
@@ -171,6 +179,8 @@ def loop_timer_callback(tmr):
     if requestedInterval>=99999999:
         print("[SERVICES] No loop interval returned.")
         requestedInterval = -1
+        
+    easywifi.disable() # Always disable wifi
     
     try:
         if pmCallback(requestedInterval):
