Write 'semver' tag with the current firmware version (#1695)

And remove `version`/`variant`.
This commit is contained in:
Raphael Coeffic
2022-03-20 19:18:01 +10:00
committed by GitHub
parent 76ae89d2f2
commit 610326f216
25 changed files with 69 additions and 108 deletions
+13 -43
View File
@@ -793,61 +793,31 @@ uint16_t eeLoadModelData(uint8_t index)
bool eeLoadGeneral(bool allowFixes)
{
theFile.openRlc(FILE_GENERAL);
if (theFile.readRlc((uint8_t*)&g_eeGeneral, 3) == 3 && g_eeGeneral.version == EEPROM_VER) {
uint8_t versions[3];
uint16_t* variant = (uint16_t*)&versions[1];
if (theFile.readRlc(versions, 3) == 3 && versions[0] == EEPROM_VER) {
theFile.openRlc(FILE_GENERAL);
if (theFile.readRlc((uint8_t*)&g_eeGeneral, sizeof(g_eeGeneral)) <= sizeof(g_eeGeneral) && g_eeGeneral.variant == EEPROM_VARIANT) {
if (theFile.readRlc((uint8_t *)&g_eeGeneral, sizeof(g_eeGeneral)) <=
sizeof(g_eeGeneral) &&
*variant == EEPROM_VARIANT) {
return true;
}
}
#if defined(PCBX7)
if (g_eeGeneral.variant == 0) {
TRACE("Pre release EEPROM detected, variant %d instead of %d for X7 radio. Loading anyway", g_eeGeneral.variant, EEPROM_VARIANT);
g_eeGeneral.variant = EEPROM_VARIANT;
storageDirty(EE_GENERAL);
return true;
}
#endif
#if defined(PCBX9LITES)
if (g_eeGeneral.variant == 0x0800) {
TRACE("Pre release EEPROM detected, variant %d instead of %d for X9LiteS radio. Loading anyway", g_eeGeneral.variant, EEPROM_VARIANT);
g_eeGeneral.variant = EEPROM_VARIANT;
storageDirty(EE_GENERAL);
return true;
}
#endif
#if defined(RADIO_T12)
if (g_eeGeneral.variant != (EEPROM_VARIANT & 0xFFFE)) {
TRACE("EEPROM variant %d instead of %d", g_eeGeneral.variant, EEPROM_VARIANT);
return false;
}
else if (g_eeGeneral.variant != EEPROM_VARIANT && g_eeGeneral.version == 218) {
TRACE("V218 T12/X7 detected, allowing use", g_eeGeneral.variant, EEPROM_VARIANT); // Production firmware use v218 X7 variant
}
else {
TRACE("EEPROM variant %d instead of %d", g_eeGeneral.variant, EEPROM_VARIANT);
return false;
}
#elif defined(PCBTARANIS)
if (g_eeGeneral.variant != EEPROM_VARIANT) {
TRACE("EEPROM variant %d instead of %d", g_eeGeneral.variant, EEPROM_VARIANT);
return false;
}
#endif
#if defined(STORAGE_CONVERSIONS)
if (g_eeGeneral.version != EEPROM_VER) {
TRACE("EEPROM version %d instead of %d", g_eeGeneral.version, EEPROM_VER);
if (versions[0] != EEPROM_VER) {
TRACE("EEPROM version %d instead of %d", versions[0], EEPROM_VER);
if (!allowFixes)
return false; // prevent eeprom from being wiped
if (!eeConvert())
if (!eeConvert(versions[0]))
return false;
}
return true;
#else
TRACE("EEPROM version %d (%d) instead of %d (%d)", g_eeGeneral.version, g_eeGeneral.variant, EEPROM_VER, EEPROM_VARIANT);
TRACE("EEPROM version %d (%d) instead of %d (%d)", versions[0], *variant,
EEPROM_VER, EEPROM_VARIANT);
return false;
#endif
}