piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[Taranis X9E] We need to have a VARIANT in eeprom to recognize a Taranis

Browse Source 
from a Taranis X9E EEPROM
This commit is contained in:
bsongis
2015-07-01 19:27:37 +02:00
parent 9dc1f2d5f8
commit b58fff1261
8 changed files with 70 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/eeprom_rlc.cpp
+6 -8
View File
@@ -893,12 +893,6 @@ void RlcFile::DisplayProgressBar(uint8_t x)
}
#endif
#if defined(PCBSTD)
#define CHECK_EEPROM_VARIANT() (g_eeGeneral.variant == EEPROM_VARIANT)
#else
#define CHECK_EEPROM_VARIANT() (1)
#endif
// For conversions ...
#if defined(CPUARM)
void loadGeneralSettings()
@@ -921,13 +915,17 @@ bool eeLoadGeneral()
theFile.openRlc(FILE_GENERAL);
if (theFile.readRlc((uint8_t*)&g_eeGeneral, 1) == 1 && g_eeGeneral.version == EEPROM_VER) {
theFile.openRlc(FILE_GENERAL);
if (theFile.readRlc((uint8_t*)&g_eeGeneral, sizeof(g_eeGeneral)) <= sizeof(EEGeneral) && CHECK_EEPROM_VARIANT()) {
if (theFile.readRlc((uint8_t*)&g_eeGeneral, sizeof(g_eeGeneral)) <= sizeof(EEGeneral) && g_eeGeneral.variant == EEPROM_VARIANT) {
return true;
}
}
#if defined(PCBTARANIS)
if (g_eeGeneral.version != EEPROM_VER) {
if (g_eeGeneral.variant != EEPROM_VARIANT) {
TRACE("EEPROM variant %d instead of %d", g_eeGeneral.variant, EEPROM_VARIANT);
return false;
}
else if (g_eeGeneral.version != EEPROM_VER) {
TRACE("EEPROM version %d instead of %d", g_eeGeneral.version, EEPROM_VER);
if (!eeConvert()) {
return false;