From 27b1255584660bef2256485321bbec53514ef1ee Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 15 Feb 2017 18:25:26 +0100 Subject: [PATCH] [X9D/X9D+/X9E] Fixes #4334 (#4451) --- radio/src/opentx.cpp | 8 ++++++-- radio/src/storage/eeprom_common.cpp | 11 ++++++++++- radio/src/storage/eeprom_common.h | 4 ++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index fb82b1ae8..9b536b36a 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -2442,7 +2442,7 @@ void opentxInit(OPENTX_INIT_ARGS) #endif #if defined(EEPROM) - storageReadAll(); + storageReadRadioSettings(); #endif // Radios handle UNEXPECTED_SHUTDOWN() differently: @@ -2461,7 +2461,11 @@ void opentxInit(OPENTX_INIT_ARGS) if (!unexpectedShutdown) { sdInit(); logsInit(); - } + } +#endif + +#if defined(EEPROM) + storageReadCurrentModel(); #endif #if defined(PCBHORUS) diff --git a/radio/src/storage/eeprom_common.cpp b/radio/src/storage/eeprom_common.cpp index 5b05c5976..c16eac557 100644 --- a/radio/src/storage/eeprom_common.cpp +++ b/radio/src/storage/eeprom_common.cpp @@ -88,7 +88,7 @@ void eeLoadModelHeaders() } #endif -void storageReadAll() +void storageReadRadioSettings() { if (!eepromOpen() || !eeLoadGeneral()) { storageEraseAll(true); @@ -105,10 +105,19 @@ void storageReadAll() } } #endif +} +void storageReadCurrentModel() +{ eeLoadModel(g_eeGeneral.currModel); } +void storageReadAll() +{ + storageReadRadioSettings(); + storageReadCurrentModel(); +} + void storageEraseAll(bool warn) { TRACE("storageEraseAll"); diff --git a/radio/src/storage/eeprom_common.h b/radio/src/storage/eeprom_common.h index 81092ba80..bd18c2279 100644 --- a/radio/src/storage/eeprom_common.h +++ b/radio/src/storage/eeprom_common.h @@ -37,3 +37,7 @@ void selectModel(uint8_t sub); #else #define eeLoadModelHeaders() #endif + +void storageReadRadioSettings(); +void storageReadCurrentModel(); +