[Taranis] A lot of new features, >100 hours work in one commit...

This commit is contained in:
bsongis
2013-11-30 11:11:14 +01:00
committed by Andre Bernet
parent 89c6bb2513
commit 4b9270182e
66 changed files with 3611 additions and 1295 deletions
+16 -11
View File
@@ -881,12 +881,17 @@ bool eeLoadGeneral()
}
}
#ifdef SIMU
printf("EEPROM version %d (%d) instead of %d (%d)\n", g_eeGeneral.version, g_eeGeneral.variant, EEPROM_VER, EEPROM_VARIANT);
fflush(stdout);
#endif
#if defined(CPUARM)
if (g_eeGeneral.version != EEPROM_VER) {
TRACE("EEPROM version %d instead of %d", g_eeGeneral.version, EEPROM_VER);
if (!eeConvert())
return false;
}
return true;
#else
TRACE("EEPROM version %d (%d) instead of %d (%d)", g_eeGeneral.version, g_eeGeneral.variant, EEPROM_VER, EEPROM_VARIANT);
return false;
#endif
}
void eeLoadModelName(uint8_t id, char *name)
@@ -947,6 +952,9 @@ void eeLoadModel(uint8_t id)
activeFnSwitches = 0;
activeFunctions = 0;
memclear(lastFunctionTime, sizeof(lastFunctionTime));
#if defined(CPUARM)
evalFunctionsFirstTime = true;
#endif
#if !defined(PCBSTD)
for (uint8_t i=0; i<MAX_TIMERS; i++) {
@@ -956,6 +964,8 @@ void eeLoadModel(uint8_t id)
}
#endif
LOAD_MODEL_CURVES();
resumeMixerCalculations();
// TODO pulses should be started after mixer calculations ...
@@ -968,7 +978,7 @@ void eeLoadModel(uint8_t id)
#endif
LOAD_MODEL_BITMAP();
LUA_LOAD_MODEL_SCRIPTS();
SEND_FAILSAFE_1S();
}
}
@@ -984,11 +994,6 @@ void eeReadAll()
ALERT(STR_EEPROMWARN, STR_BADEEPROMDATA, AU_BAD_EEPROM);
if (pwrCheck() == e_power_off) {
// the radio has been powered off during the ALERT
pwrOff();
}
MESSAGE(STR_EEPROMWARN, STR_EEPROMFORMATTING, NULL, AU_EEPROM_FORMATTING);
EeFsFormat();