Merge pull request SHA2017-badge#142 from SHA2017-badge/renze-easyapi

renzenicolai · web-flow · commit 209576a53441 · 2017-07-30T17:07:41.000+02:00
Split splash into smaller parts, thereby creating helper files for some functions
diff --git a/esp32/modules/easydraw.py b/esp32/modules/easydraw.py
@@ -0,0 +1,52 @@
+# File: easydraw.py
+# Version: 1
+# Description: Wrapper that makes drawing things simple
+# License: MIT
+# Authors: Renze Nicolai <renze@rnplus.nl>
+
+import ugfx, badge
+
+# Globals
+msgLineNumber = 0
+msgShown = False
+
+# Functions
+def msg(message, clear=False):
+    global msgShown
+    msgShown = True
+    global msgLineNumber
+    if clear:
+        ugfx.clear(ugfx.WHITE)
+        ugfx.string(0, 0, message, "PermanentMarker22", ugfx.BLACK)
+        ugfx.set_lut(ugfx.LUT_FASTER)
+        ugfx.flush()
+        msgLineNumber = 0
+    else:
+        ugfx.string(0, 30 + (msgLineNumber * 15), message, "Roboto_Regular12", ugfx.BLACK)
+        ugfx.flush()
+        msgLineNumber += 1
+
+def nickname(y = 25, font = "PermanentMarker36", color = ugfx.BLACK):
+    nick = badge.nvs_get_str("owner", "name", 'Jan de Boer')
+    ugfx.string_box(0,y,296,38, nick, font, color, ugfx.justifyCenter)
+        
+def battery(vUsb, vBatt, charging):
+    if charging and vUsb>4000:
+        try:
+            badge.eink_png(0,0,'/lib/resources/chrg.png')
+        except:
+            ugfx.string(0, 0, "CHRG",'Roboto_Regular12',ugfx.BLACK)
+    elif vUsb>4000:
+        try:
+            badge.eink_png(0,0,'/lib/resources/usb.png')
+        except:
+            ugfx.string(0, 0, "USB",'Roboto_Regular12',ugfx.BLACK)
+    else:
+        width = round((vBatt-vMin) / (vMax-vMin) * 44)
+        if width < 0:
+            width = 0
+        elif width > 38:
+            width = 38
+        ugfx.box(2,2,46,18,ugfx.BLACK)
+        ugfx.box(48,7,2,8,ugfx.BLACK)
+        ugfx.area(3,3,width,16,ugfx.BLACK)
diff --git a/esp32/modules/easyrtc.py b/esp32/modules/easyrtc.py
@@ -0,0 +1,43 @@
+# File: easyrtc.py
+# Version: 1
+# Description: Wrapper that makes using the clock simple
+# License: MIT
+# Authors: Renze Nicolai <renze@rnplus.nl>
+
+import machine, time
+
+# Functions
+def string(date=False, time=True):
+    [year, month, mday, wday, hour, min, sec, usec] = machine.RTC().datetime()
+    monthstr = str(month)
+    if (month<10):
+      monthstr = "0"+monthstr
+    daystr = str(mday)
+    if (mday<10):
+      daystr = "0"+daystr
+    hourstr = str(hour)
+    if (hour<10):
+      hourstr = "0"+hourstr
+    minstr = str(min)
+    if (min<10):
+      minstr = "0"+minstr 
+    output = ""
+    if date:
+        output += daystr+"-"+monthstr+"-"+str(year)
+        if time:
+            output += " "
+    if time:
+        output += hourstr+":"+minstr
+    return output
+
+def configure():
+    import easywifi
+    import easydraw
+    import ntp
+    if not easywifi.status():
+        if not easywifi.enable():
+            return False
+    easydraw.msg("Configuring clock...", True)
+    ntp.set_NTP_time()
+    easydraw.msg("Done")
+    return True
diff --git a/esp32/modules/easywifi.py b/esp32/modules/easywifi.py
@@ -0,0 +1,49 @@
+# File: easywifi.py
+# Version: 1
+# Description: Wrapper that makes using wifi simple
+# License: MIT
+# Authors: Renze Nicolai <renze@rnplus.nl>
+
+import time, network, badge, easydraw
+
+state = False
+
+def status():
+    global state
+    return state
+
+def force_enable():
+    global state
+    state = False
+    enable()
+
+def enable():
+    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')
+            nw.connect(ssid, password) if password else nw.connect(ssid)
+
+            easydraw.msg("Connecting to WiFi...", True)
+            easydraw.msg("SSID: "+ssid)
+
+            timeout = badge.nvs_get_u8('badge', 'wifi.timeout', 40)
+            while not nw.isconnected():
+                time.sleep(0.1)
+                timeout = timeout - 1
+                if (timeout<1):
+                    easydraw.msg("Timeout while connecting!")
+                    disable()
+                    return False
+            easydraw.msg("Connected!")
+            state = True
+    return True
+
+def disable():
+    global state
+    state = False
+    nw = network.WLAN(network.STA_IF)
+    nw.active(False)
diff --git a/esp32/modules/splash.py b/esp32/modules/splash.py
