Merge pull request SHA2017-badge#155 from SHA2017-badge/renze-bugfix

Roosted7 · web-flow · commit 659ddef14c2b · 2017-07-31T17:28:26.000+02:00
Fix errors introduced by changing easydraw.msg() function
diff --git a/esp32/modules/easydraw.py b/esp32/modules/easydraw.py
@@ -12,19 +12,28 @@ def msg(message, title = 'Still Loading Anyway...', reset = False):
 
     title can be optionaly set when resetting or first call
     """
-    global lineNumber
-    if reset:
-        del lineNumber
+    global messageHistory
+
     try:
-        lineNumber
+        messageHistory
+        if reset:
+            raise exception
     except:
         ugfx.clear(ugfx.WHITE)
         ugfx.string(0, 0, title, "PermanentMarker22", ugfx.BLACK)
-        lineNumber = 0
+        messageHistory = []
+
+    if len(messageHistory)<6:
+        ugfx.string(0, 30 + (len(messageHistory) * 15), message, "Roboto_Regular12", ugfx.BLACK)
+        messageHistory.append(message)
     else:
-        ugfx.string(0, 30 + (lineNumber * 15), message, "Roboto_Regular12", ugfx.BLACK)
-        ugfx.flush(ugfx.LUT_FASTER)
-        lineNumber += 1
+        messageHistory.pop(0)
+        messageHistory.append(message)
+        ugfx.area(0,30, 296, 98, ugfx.WHITE)
+        for i, message in enumerate(messageHistory):
+            ugfx.string(0, 30 + (i * 15), message, "Roboto_Regular12", ugfx.BLACK)
+
+    ugfx.flush(ugfx.LUT_FASTER)
 
 def nickname(y = 25, font = "PermanentMarker36", color = ugfx.BLACK):
     nick = badge.nvs_get_str("owner", "name", 'Jan de Boer')
diff --git a/esp32/modules/easyrtc.py b/esp32/modules/easyrtc.py
@@ -37,7 +37,7 @@ def configure():
     if not easywifi.status():
         if not easywifi.enable():
             return False
-    easydraw.msg("Configuring clock...", True)
+    easydraw.msg("Configuring clock...")
     ntp.set_NTP_time()
     easydraw.msg("Done")
     return True
diff --git a/esp32/modules/easywifi.py b/esp32/modules/easywifi.py
@@ -17,24 +17,29 @@ def force_enable():
     state = False
     enable()
 
-def enable():
+def enable(showStatus=True):
     global state
     if not state:
         nw = network.WLAN(network.STA_IF)
         if not nw.isconnected():
             nw.active(True)
             ssid = badge.nvs_get_str('badge', 'wifi.ssid', 'SHA2017-insecure')
             password = badge.nvs_get_str('badge', 'wifi.password')
+            if showStatus:
+                easydraw.msg("Connecting to '"+ssid+"'...")
             nw.connect(ssid, password) if password else nw.connect(ssid)
-
             timeout = badge.nvs_get_u8('badge', 'wifi.timeout', 40)
             while not nw.isconnected():
                 time.sleep(0.1)
                 timeout = timeout - 1
                 if (timeout<1):
+                    if showStatus:
+                        easydraw.msg("Error: could not connect!")
                     disable()
                     return False
             state = True
+            if showStatus:
+                easydraw.msg("Connected!")
     return True
 
 def disable():
diff --git a/esp32/modules/launcher.py b/esp32/modules/launcher.py
@@ -53,8 +53,7 @@ def uninstall_it(pushed):
 
         def perform_uninstall(ok):
             if ok:
-                easydraw.msg("Uninstalling:",True)
-                easydraw.msg(selected)
+                easydraw.msg(selected,"Uninstalling...",True)
                 install_path = get_install_path()
                 for rm_file in os.listdir("%s/%s" % (install_path, selected)):
                     os.remove("%s/%s/%s" % (install_path, selected, rm_file))
