mirror of
https://codeberg.org/mclemens/ubitxv6.git
synced 2024-10-02 20:55:57 -04:00
Load EEPROM settings immediately, and load defaults prior to loading EEPROM values so that we fall back on defaults rather than 0's
This commit is contained in:
parent
f329950b6e
commit
227cbe9b07
@ -157,7 +157,6 @@ void displayInit(void){
|
||||
tft.setRotation(1);
|
||||
|
||||
xpt2046_Init();
|
||||
readTouchCalibration();
|
||||
}
|
||||
|
||||
void displayPixel(unsigned int x, unsigned int y, unsigned int c){
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user