Merge pull request SHA2017-badge#124 from SHA2017-badge/rstd-newSetup

Roosted7 · web-flow · commit e1f8c26fe0ea · 2017-07-26T01:46:52.000+02:00
New setup and default name
diff --git a/esp32/modules/setup.py b/esp32/modules/setup.py
@@ -1,59 +1,28 @@
 # SETUP APPLICATION
-# SHOWN ON FIRST BOOT
+# v2 by Thomas Roos
+# v1 by Renze Nicolai
 
-import ugfx, badge, appglue, dialogs, utime
+import ugfx, badge, appglue, dialogs
 
-def load_settings():
-    return badge.nvs_get_str("owner", "name", "")
+def asked_nickname(value):
+    if value:
+        badge.nvs_set_str("owner", "name", value)
 
-def store_settings(nickname):
-    badge.nvs_set_str("owner", "name", nickname)
+        # Do the firstboot magic
+        newState = 1 if badge.nvs_get_u8('badge', 'setup.state', 0) == 0 else 3
+        badge.nvs_set_u8('badge', 'setup.state', newState)
 
-def is_developer(nickname):
-    if (nickname==""):
+        # 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)
+    else:
         badge.nvs_set_u8('badge', 'setup.state', 2) # Skip the sponsors
-        return True
-    return False
 
-def action_home(pressed):
-    if (pressed):
-        appglue.start_app("")
-
-def set_setup_state():
-    s_old = badge.nvs_get_u8('badge', 'setup.state', 0)
-    s_new = 2
-    if (s_old==0):
-        s_new = 1
-    badge.nvs_set_u8('badge', 'setup.state', s_new)
-
-def draw_setup_completed():
-    ugfx.clear(ugfx.WHITE)
-    ugfx.string(0, 0, "Setup", "PermanentMarker22", ugfx.BLACK)
-    ugfx.string(0, 25, "Settings stored to flash!", "Roboto_Regular12", ugfx.BLACK)
-    ugfx.set_lut(ugfx.LUT_FASTER)
-    ugfx.flush()
-
-def return_to_home():
     badge.eink_busy_wait()
     appglue.start_app("")
 
-def program_main():
-    ugfx.init()
-    nickname = load_settings()
-
-    def asked_nickname(value):
-        nickname = value if value else nickname
-        if not is_developer(nickname):
-            store_settings(nickname)
-            # Do the firstboot magic
-            set_setup_state()
-            # Show the user that we are done
-            draw_setup_completed()
-            utime.sleep(2)
-        return_to_home()
-    
-    dialogs.prompt_text("Nickname", nickname, cb=asked_nickname)
-
-# Start main application
-program_main()
-
+ugfx.init()
+nickname = badge.nvs_get_str("owner", "name", "")
+dialogs.prompt_text("Nickname", nickname, cb=asked_nickname)
diff --git a/esp32/modules/splash.py b/esp32/modules/splash.py
@@ -197,21 +197,21 @@ def inputInit():
     ugfx.input_attach(ugfx.JOY_RIGHT, press_nothing)
 
 def checkFirstBoot():
-    setupcompleted = int(badge.nvs_get_str('badge', 'setup.state', '0'))
+    setupcompleted = badge.nvs_get_u8('badge', 'setup.state', 0)
     if setupcompleted == 0: # First boot (open setup)
         print("[SPLASH] Setup not completed. Running setup!")
         appglue.start_app("setup")
     elif setupcompleted == 1: # Second boot (after setup)
         print("[SPLASH] Showing sponsors once...")
-        badge.nvs_set_str('badge', 'setup.state', '2') # Only force show sponsors once
+        badge.nvs_set_u8('badge', 'setup.state', 2) # Only force show sponsors once
         appglue.start_app("sponsors")
     elif setupcompleted == 2:
-        badge.nvs_set_str('badge', 'setup.state', '3')
+        badge.nvs_set_u8('badge', 'setup.state', 3)
         check_ota_available()
     else: # Setup completed
         print("[SPLASH] Normal boot.")
 
-nick = badge.nvs_get_str("owner", "name", 'John Doe')
+nick = badge.nvs_get_str("owner", "name", 'Jan de Boer')
 vMin = badge.nvs_get_u16('splash', 'bat.volt.min', 3600) # mV
 vMax = badge.nvs_get_u16('splash', 'bat.volt.max', 4200) # mV
 if badge.battery_charge_status() == False and badge.usb_volt_sense() > 4500 and badge.battery_volt_sense() > 2500:
