New installer version :D

Roosted7 · Roosted7 · commit 60a3e8e4277c · 2017-07-26T14:53:35.000+02:00
diff --git a/esp32/modules/installer.py b/esp32/modules/installer.py
@@ -1,96 +1,54 @@
-import ugfx, badge, sys, gc
-import uos as os
-import uerrno as errno
-import ujson as json
-import network, wifi
-import machine, esp, time
-import urequests as requests
-import appglue
-
-wifi.init()
-
-ugfx.clear(ugfx.BLACK)
-ugfx.string(20,25,"Connecting to:","Roboto_BlackItalic24",ugfx.WHITE)
-ugfx.string(140,75, "WiFi","PermanentMarker22",ugfx.WHITE)
-ugfx.flush()
-
-timeout = 250
-while not wifi.sta_if.isconnected():
-	time.sleep(0.1)
-	timeout = timeout - 1
-	if (timeout<1):
-		ugfx.clear(ugfx.BLACK)
-		ugfx.string(5,5,"Failure.","Roboto_BlackItalic24",ugfx.WHITE)
-		ugfx.flush()
-		time.sleep(2)
-		appglue.start_app("")
-	pass
-
-ugfx.clear(ugfx.WHITE)
+import ugfx, badge, network, gc, time, urequests, appglue
+
+# SHA2017 Badge installer
+# V2 Thomas Roos
+# V1 Niek Blankers
+
+def draw_msg(msg):
+    global line_number
+    try:
+        line_number
+    except:
+        line_number = 0
+        ugfx.clear(ugfx.WHITE)
+        ugfx.string(0, 0, 'Still Loading Anyway...', "PermanentMarker22", ugfx.BLACK)
+        ugfx.set_lut(ugfx.LUT_FASTER)
+        draw_msg(msg)
+    else:
+        ugfx.string(0, 30 + (line_number * 15), msg, "Roboto_Regular12", ugfx.BLACK)
+        ugfx.flush()
+        line_number += 1
+
+def connectWiFi():
+    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)
+
+        draw_msg("Connecting to '"+ssid+"'...")
+
+        timeout = badge.nvs_get_u8('splash', 'wifi.timeout', 40)
+        while not nw.isconnected():
+            time.sleep(0.1)
+            timeout = timeout - 1
+            if (timeout<1):
+                draw_msg("Timeout while connecting!")
+                nw.active(True)
+                return False
+    return True
 
 def show_description(active):
 	if active:
+		global text
 		text.text(packages[options.selected_index()]["description"])
 		ugfx.flush()
 
-def empty_options():
-	global options
-	options.destroy()
-	options = ugfx.List(0,0,int(ugfx.width()/2),ugfx.height())
-
-ugfx.input_init()
-
-window = ugfx.Container(0, 0, ugfx.width(), ugfx.height())
-
-options = ugfx.List(0,0,int(ugfx.width()/2),ugfx.height())
-
-text = ugfx.Textbox(int(ugfx.width()/2),0, int(ugfx.width()/2), ugfx.height())
-text.text("Downloading category list...")
-
-ugfx.flush(ugfx.LUT_FULL)
-badge.eink_busy_wait()
-ugfx.set_lut(ugfx.LUT_FASTER)
-
-packages = {} # global variable
-
-gc.collect()
-
-f = requests.get("https://badge.sha2017.org/eggs/categories/json")
-try:
-	categories = f.json()
-finally:
-	f.close()
-
-gc.collect()
-
-def show_category(active):
-    if active:
-		ugfx.string_box(148,0,148,26, "Hatchery", "Roboto_BlackItalic24", ugfx.BLACK, ugfx.justifyCenter)
-		text.text("Install or update eggs from the hatchery here.\nSelect a category to start, or press B to return to the launcher.\n\nbadge.sha2017.org")
-		ugfx.flush()
-
-def list_categories():
-	global options
-	global text
-
-	empty_options()
-	text.destroy()
-	text = ugfx.Textbox(int(ugfx.width()/2),26,int(ugfx.width()/2),ugfx.height()-26)
-
-	ugfx.input_attach(ugfx.JOY_UP, show_category)
-	ugfx.input_attach(ugfx.JOY_DOWN, show_category)
-	ugfx.input_attach(ugfx.BTN_A, select_category)
-	ugfx.input_attach(ugfx.BTN_B, lambda pushed: appglue.start_app("launcher") if pushed else 0)
-	ugfx.input_attach(ugfx.BTN_START, lambda pushed: appglue.start_app("") if pushed else 0)
-
-	for category in categories:
-		options.add_item("%s (%d) >" % (category["name"], category["eggs"]))
-
-	show_category(True)
-
 def select_category(active):
 	if active:
 		global categories
+		global options
 		index = options.selected_index()
 		category = categories[index]["slug"]
 		list_apps(category)
@@ -106,46 +64,48 @@ def list_apps(slug):
 	ugfx.input_attach(ugfx.BTN_B, 0)
 	ugfx.input_attach(ugfx.BTN_START, 0)
 
-	empty_options()
-	text.destroy()
-	text = ugfx.Textbox(int(ugfx.width()/2),0, int(ugfx.width()/2), ugfx.height())
+	while options.count() > 0:
+		options.remove_item(0)
 	text.text("Downloading list of eggs...")
-	ugfx.flush(ugfx.LUT_FULL)
-	badge.eink_busy_wait()
+	ugfx.flush()
 
-	gc.collect()
-	f = requests.get("https://badge.sha2017.org/eggs/category/%s/json" % slug)
 	try:
+		f = urequests.get("https://badge.sha2017.org/eggs/category/%s/json" % slug)
 		packages = f.json()
 	finally:
 		f.close()
 
-	gc.collect()
-
 	for package in packages:
 		options.add_item("%s rev. %s" % (package["name"], package["revision"]))
 
 	ugfx.input_attach(ugfx.JOY_UP, show_description)
 	ugfx.input_attach(ugfx.JOY_DOWN, show_description)
 	ugfx.input_attach(ugfx.BTN_A, install_app)
-	ugfx.input_attach(ugfx.BTN_B, lambda pushed: appglue.start_app("installer") if pushed else 0)
-	ugfx.input_attach(ugfx.BTN_START, lambda pushed: appglue.start_app("installer") if pushed else 0)
+	ugfx.input_attach(ugfx.BTN_B, lambda pushed: list_categories() if pushed else 0)
+	ugfx.input_attach(ugfx.BTN_START, lambda pushed: appglue.start_app('') if pushed else 0)
 
 	show_description(True)
-	badge.eink_busy_wait()
 	ugfx.set_lut(ugfx.LUT_FASTER)
+	gc.collect()
+
+def start_categories(pushed):
+	if pushed:
+		list_categories()
+
+def start_app(pushed):
+	if pushed:
+		global selected_app
+		appglue.start_app(selected_app)
 
 def install_app(active):
 	if active:
 		global options
 		global text
 		global packages
+		global selected_app
 
 		index = options.selected_index()
 
-		options.destroy()
-		text.destroy()
-
 		ugfx.input_attach(ugfx.JOY_UP, 0)
 		ugfx.input_attach(ugfx.JOY_DOWN, 0)
 		ugfx.input_attach(ugfx.BTN_A, 0)
@@ -158,19 +118,71 @@ def install_app(active):
 		ugfx.flush()
 
 		import woezel
-		woezel.install(packages[index]["slug"])
+		selected_app =  packages[index]["slug"]
+		woezel.install(selected_app)
 
 		ugfx.clear(ugfx.WHITE)
 		ugfx.string(40,25,"Installed:","Roboto_BlackItalic24",ugfx.BLACK)
 		ugfx.string(100,55, packages[index]["name"],"PermanentMarker22",ugfx.BLACK)
-		text = ugfx.Textbox(0,100, ugfx.width(), ugfx.height()-100)
-		text.text("Press A to start %s, or B to return to the installer" % packages[index]["name"])
-		
-		ugfx.input_attach(ugfx.BTN_A, lambda pushed: appglue.start_app(packages[index]["slug"]) if pushed else 0)
-		ugfx.input_attach(ugfx.BTN_B, lambda pushed: appglue.start_app("installer"))
-		ugfx.input_attach(ugfx.BTN_START, lambda pushed: appglue.start_app(""))
+		ugfx.string(0, 115, "[ A: START | B: BACK ]", "Roboto_Regular12", ugfx.BLACK)
+
+		ugfx.input_attach(ugfx.BTN_A, start_app)
+		ugfx.input_attach(ugfx.BTN_B, start_categories)
+		ugfx.input_attach(ugfx.BTN_START, lambda pushed: appglue.start_app("") if pushed else 0)
 
 		ugfx.flush()
+		gc.collect()
+
+def list_categories():
+	global options
+	global text
+	global categories
+
+	try:
+		categories
+	except:
+		ugfx.input_init()
+		draw_msg('Getting categories')
+		try:
+			f = urequests.get("https://badge.sha2017.org/eggs/categories/json")
+			categories = f.json()
+		except:
+			draw_msg('Failed!')
+			draw_msg('Returning to launcher :(')
+			appglue.start_app('launcher')
+
+			f.close()
+			draw_msg('Done!')
+
+	ugfx.input_attach(ugfx.JOY_UP, lambda pushed: ugfx.flush() if pushed else 0)
+	ugfx.input_attach(ugfx.JOY_DOWN, lambda pushed: ugfx.flush() if pushed else 0)
+	ugfx.input_attach(ugfx.BTN_A, select_category)
+	ugfx.input_attach(ugfx.BTN_B, lambda pushed: appglue.start_app("launcher") if pushed else 0)
+	ugfx.input_attach(ugfx.BTN_START, lambda pushed: appglue.start_app("") if pushed else 0)
 
+	ugfx.clear(ugfx.WHITE)
+	ugfx.flush()
 
-list_categories()
+	while options.count() > 0:
+		options.remove_item(0)
+	for category in categories:
+		options.add_item("%s (%d) >" % (category["name"], category["eggs"]))
+
+	ugfx.string_box(148,0,148,26, "Hatchery", "Roboto_BlackItalic24", ugfx.BLACK, ugfx.justifyCenter)
+	text.text("Install or update eggs from the hatchery here\n\n\n\n")
+	ugfx.line(148, 78, 296, 78, ugfx.BLACK)
+	ugfx.string_box(148,78,148,18, " A: Open catergory", "Roboto_Regular12", ugfx.BLACK, ugfx.justifyLeft)
+	ugfx.string_box(148,92,148,18, " B: Return to home", "Roboto_Regular12", ugfx.BLACK, ugfx.justifyLeft)
+	ugfx.line(148, 110, 296, 110, ugfx.BLACK)
+	ugfx.string_box(148,110,148,18, " badge.sha2017.org", "Roboto_Regular12", ugfx.BLACK, ugfx.justifyLeft)
+	ugfx.flush(ugfx.LUT_FULL)
+	gc.collect()
+
+
+if not connectWiFi():
+	draw_msg('Returning to launcher :(')
+	appglue.start_app('launcher')
+else:
+	options = ugfx.List(0,0,int(ugfx.width()/2),ugfx.height())
+	text = ugfx.Textbox(int(ugfx.width()/2),0, int(ugfx.width()/2), ugfx.height())
+	list_categories()
diff --git a/esp32/modules/launcher.py b/esp32/modules/launcher.py
@@ -1,14 +1,8 @@
-import ugfx, badge, sys, gc
-import uos as os
-import uerrno as errno
-import ujson as json
-import time
-import esp
-import appglue
-import version
+import ugfx, badge, sys, uos as os, appglue, version
 
 ugfx.init()
 ugfx.input_init()
+ugfx.set_lut(ugfx.LUT_FASTER)
 ugfx.clear(ugfx.BLACK)
 ugfx.flush()
 ugfx.clear(ugfx.WHITE)
@@ -31,8 +25,8 @@
 # Instructions
 ugfx.line(148, 78, 296, 78, ugfx.BLACK)
 ugfx.string_box(148,78,148,18, " A: Run", "Roboto_Regular12", ugfx.BLACK, ugfx.justifyLeft)
-ugfx.string_box(148,78,148,18, " B: Uninstall", "Roboto_Regular12", ugfx.BLACK, ugfx.justifyRight)
-ugfx.string_box(148,92,148,18, " START: Return to home", "Roboto_Regular12", ugfx.BLACK, ugfx.justifyLeft)
+ugfx.string_box(148,78,148,18, " B: Return to home", "Roboto_Regular12", ugfx.BLACK, ugfx.justifyRight)
+ugfx.string_box(148,92,148,18, " SELECT: Uninstall", "Roboto_Regular12", ugfx.BLACK, ugfx.justifyLeft)
 ugfx.line(148, 110, 296, 110, ugfx.BLACK)
 ugfx.string_box(148,110,148,18, " " + version.name, "Roboto_Regular12", ugfx.BLACK, ugfx.justifyLeft)
 
@@ -113,13 +107,12 @@ def perform_uninstall(ok):
 populate_it()
 
 ugfx.input_attach(ugfx.BTN_A, run_it)
-ugfx.input_attach(ugfx.BTN_B, uninstall_it)
+ugfx.input_attach(ugfx.BTN_SELECT, uninstall_it)
 
 ugfx.input_attach(ugfx.JOY_UP, lambda pushed: ugfx.flush() if pushed else 0)
 ugfx.input_attach(ugfx.JOY_DOWN, lambda pushed: ugfx.flush() if pushed else 0)
 
+ugfx.input_attach(ugfx.BTN_B, lambda pushed: appglue.start_app("") if pushed else 0)
 ugfx.input_attach(ugfx.BTN_START, lambda pushed: appglue.start_app("") if pushed else 0)
 
-ugfx.set_lut(ugfx.LUT_FULL)
-ugfx.flush()
-ugfx.set_lut(ugfx.LUT_FASTER)
+ugfx.flush(ugfx.LUT_FULL)
diff --git a/esp32/modules/splash.py b/esp32/modules/splash.py
@@ -61,8 +61,8 @@ def draw_home(do_BPP):
     if do_BPP:
         info = '[ ANY: Wake up ]'
     elif OTA_available:
-        info = '[ B: UPDATE ] [ START: LAUNCHER ]'
-        ugfx.string(0, 108, 'OTA ready!', 'Roboto_Regular18', ugfx.BLACK)
+        info = '[ SELECT: UPDATE | START: LAUNCHER ]'
+        ugfx.string(0, 115, 'OTA ready!', 'Roboto_Regular12', ugfx.BLACK)
     else:
         info = '[ START: LAUNCHER ]'
 
@@ -79,7 +79,7 @@ def draw_home(do_BPP):
         # appglue.start_bpp() ## SHOULD BE THIS!!
         deepsleep.start_sleeping()
     else:
-        ugfx.input_attach(ugfx.BTN_B, start_ota)
+        ugfx.input_attach(ugfx.BTN_SELECT, start_ota)
 
 def start_ota(pushed):
     if pushed:
@@ -232,7 +232,6 @@ def checkFirstBoot():
 else:
     OTA_available = badge.nvs_get_u8('badge','OTA.ready',0)
 
-disableWiFi()
 ugfx.clear(ugfx.WHITE)
 ugfx.flush(ugfx.LUT_FASTER)
 
