Fix a big bug and a little bit of cleaning

renzenicolai · renzenicolai · commit 652dc0a54c6f · 2017-07-30T17:31:20.000+02:00
diff --git a/esp32/modules/easydraw.py b/esp32/modules/easydraw.py
@@ -31,6 +31,8 @@ def nickname(y = 25, font = "PermanentMarker36", color = ugfx.BLACK):
     ugfx.string_box(0,y,296,38, nick, font, color, ugfx.justifyCenter)
         
 def battery(vUsb, vBatt, charging):
+    vMin = badge.nvs_get_u16('batt', 'vmin', 3700) # mV
+    vMax = badge.nvs_get_u16('batt', 'vmax', 4200) # mV
     if charging and vUsb>4000:
         try:
             badge.eink_png(0,0,'/lib/resources/chrg.png')
diff --git a/esp32/modules/launcher.py b/esp32/modules/launcher.py
@@ -1,4 +1,4 @@
-import ugfx, badge, sys, uos as os, appglue, version
+import ugfx, badge, sys, uos as os, appglue, version, easydraw
 
 def populate_it():
     global options
@@ -15,6 +15,8 @@ def populate_it():
     for app in apps:
         if not app=="resources":
             options.add_item(app)
+            
+    options.add_item('setup')
         
 def run_it(pushed):
     if (pushed):
@@ -51,10 +53,8 @@ def uninstall_it(pushed):
 
         def perform_uninstall(ok):
             if ok:
-                ugfx.clear(ugfx.BLACK)
-                ugfx.string_box(0, 25, 296, 25,"Uninstalling:","Roboto_BlackItalic24",ugfx.WHITE, ugfx.justifyCenter)
-                ugfx.string_box(0, 51, 296, 23, selected, "PermanentMarker22", ugfx.WHITE, ugfx.justifyCenter)
-                ugfx.flush()
+                easydraw.msg("Uninstalling:",True)
+                easydraw.msg(selected)
                 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))
@@ -107,7 +107,7 @@ def perform_uninstall(ok):
 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.input_attach(ugfx.BTN_B, lambda pushed: appglue.home() if pushed else 0)
+#ugfx.input_attach(ugfx.BTN_START, lambda pushed: appglue.home() if pushed else 0)
 
 ugfx.flush(ugfx.LUT_FULL)
diff --git a/esp32/modules/setup.py b/esp32/modules/setup.py
@@ -1,8 +1,11 @@
-# SETUP APPLICATION
-# v2 by Thomas Roos
-# v1 by Renze Nicolai
+# File: setup.py
+# Version: 3
+# Description: Setup for SHA2017 badge
+# License: MIT
+# Authors: Renze Nicolai <renze@rnplus.nl>
+#          Thomas Roos   <?>
 
-import ugfx, badge, appglue, dialogs
+import ugfx, badge, appglue, dialogs, easydraw, time
 
 def asked_nickname(value):
     if value:
@@ -13,16 +16,22 @@ def asked_nickname(value):
         badge.nvs_set_u8('badge', 'setup.state', newState)
 
         # Show the user that we are done
-        ugfx.clear(ugfx.WHITE)
-        ugfx.string(0, 0, "Hi, " + value, "PermanentMarker22", ugfx.BLACK)
-        ugfx.string(0, 25, "Your nick is stored to flash!", "Roboto_Regular12", ugfx.BLACK)
-        ugfx.flush(ugfx.LUT_FASTER)
+        easydraw.msg("Hi "+value+"!",True)
+        easydraw.msg("Your nick has been stored to flash!")
+        time.sleep(0.5)
     else:
         badge.nvs_set_u8('badge', 'setup.state', 2) # Skip the sponsors
+        badge.nvs_set_u8('sponsors', 'shown', 1)
+        easydraw.msg("Hi developer!",True)
+        time.sleep(0.5)
 
     badge.eink_busy_wait()
-    appglue.start_app("")
+    appglue.home()
 
 ugfx.init()
 nickname = badge.nvs_get_str("owner", "name", "")
+
+easydraw.msg("Welcome to SHA2017!",True)
+time.sleep(1)
+
 dialogs.prompt_text("Nickname", nickname, cb=asked_nickname)
diff --git a/esp32/modules/splash.py b/esp32/modules/splash.py
@@ -300,8 +300,6 @@ def splash_timer_callback(tmr):
 ### PROGRAM
 
 # Load settings from NVS
-vMin = badge.nvs_get_u16('splash', 'bat.volt.min', 3700) # mV
-vMax = badge.nvs_get_u16('splash', 'bat.volt.max', 4200) # mV
 otaAvailable = badge.nvs_get_u8('badge','OTA.ready',0)
 
 # Calibrate battery voltage drop
