From 227cbe9b071caaf2564323ff262c1bf14a05a285 Mon Sep 17 00:00:00 2001
From: Reed Nightingale <reed.nightingale@gmail.com>
Date: Mon, 13 Jan 2020 23:38:12 -0800
Subject: [PATCH] Load EEPROM settings immediately, and load defaults prior to
 loading EEPROM values so that we fall back on defaults rather than 0's

---
 nano_gui.cpp          | 1 -
 ubitx_v6.3.1_code.ino | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nano_gui.cpp b/nano_gui.cpp
index a3932ac..938ccee 100644
--- a/nano_gui.cpp
+++ b/nano_gui.cpp
@@ -157,7 +157,6 @@ void displayInit(void){
   tft.setRotation(1);
 
   xpt2046_Init();
-  readTouchCalibration();
 }
 
 void displayPixel(unsigned int x, unsigned int y, unsigned int c){
diff --git a/ubitx_v6.3.1_code.ino b/ubitx_v6.3.1_code.ino
index a25964d..4af8c35 100644
--- a/ubitx_v6.3.1_code.ino
+++ b/ubitx_v6.3.1_code.ino
@@ -420,6 +420,7 @@ void doRIT(){
  * variables.
  */
 void initSettings(){
+  LoadDefaultSettings();
   LoadSettingsFromEeprom();
 }
 
@@ -461,8 +462,8 @@ void setup()
   Serial.begin(38400);
   Serial.flush();  
 
-  displayInit();
   initSettings();
+  displayInit();
   initPorts();
   initOscillators();
   setFrequency(globalSettings.vfoA.frequency);