[splash] Determine battery status after loading settings

raboof · raboof · commit 902621976e8a · 2017-07-24T23:28:24.000+02:00
Because the settings influence how the battery percentage is calculated.
diff --git a/esp32/modules/splash.py b/esp32/modules/splash.py
@@ -489,19 +489,21 @@ def load_settings():
     timer_loop_amount = badge.nvs_get_u8('splash', 'timer.amount', 25)
     global loopCnt
     loopCnt = timer_loop_amount
-    
+
 # MAIN
-def splash_main():   
+def splash_main():
     cstate = badge.battery_charge_status()
-    percent = battery_percent()
-    vbatt = badge.battery_volt_sense()
-    print("[SPLASH] Vbatt = "+str(vbatt))
     load_settings()
-    
+
     global header_status_string
     header_status_string = ""
-        
+
     ugfx.init()
+
+    percent = battery_percent()
+    vbatt = badge.battery_volt_sense()
+    print("[SPLASH] Vbatt = "+str(vbatt))
+
     global battery_percent_empty
     if (cstate) or (percent>battery_percent_empty) or (vbatt<100):
         ugfx.input_init()
