[stock / gruvin9x] FrSky and DSM2 serial mode

[Sky9x] Bootloader mode on REVC
This commit is contained in:
bsongis
2012-12-10 10:30:54 +00:00
parent fb7525e42d
commit 2037f0d8b0
8 changed files with 43 additions and 62 deletions
+9 -7
View File
@@ -500,8 +500,6 @@ void eeLoadModel(uint8_t id)
activeFunctions = 0;
activeFunctionSwitches = 0;
resetProto();
for (uint8_t i=0; i<MAX_TIMERS; i++) {
if (g_model.timers[i].remanent) {
s_timerVal[i] = g_model.timers[i].value;
@@ -511,6 +509,10 @@ void eeLoadModel(uint8_t id)
resumeMixerCalculations();
// TODO pulses should be started after mixer calculations ...
#if defined(FRSKY)
FRSKY_setModelAlarms();
#endif
LOAD_MODEL_BITMAP();
}
}
@@ -542,7 +544,11 @@ void eeReadAll()
modelDefault(0);
if (!SKIP_INIT()) {
if (check_soft_power()==e_power_off) {
// we don't want to store anything
s_eeDirtyMsk = 0;
}
else {
/* we remove all models */
for (uint32_t i=0; i<MAX_MODELS; i++)
eeDeleteModel(i);
@@ -550,10 +556,6 @@ void eeReadAll()
STORE_GENERALVARS;
STORE_MODELVARS;
}
else {
// we don't want to store anything
s_eeDirtyMsk = 0;
}
}
else
{