Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-19 14:25:11 +03:00
Code Issues Wiki Activity

mAh was store two times on Tx shutdown

Browse source
This commit is contained in:
Bertrand Songis 2014-02-10 16:17:47 +01:00
parent 9ac30369e0
commit c205336fa6
2 changed files with 17 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

40
radio/src/opentx.cpp
View file

@ -4365,8 +4365,10 @@ void opentxClose()
hapticOff(); hapticOff();
#endif #endif
saveTimers();
#if defined(CPUARM) && defined(FRSKY) #if defined(CPUARM) && defined(FRSKY)
if((g_model.frsky.mAhPersistent) && (g_model.frsky.storedMah != frskyData.hub.currentConsumption)) { if ((g_model.frsky.mAhPersistent) && (g_model.frsky.storedMah != frskyData.hub.currentConsumption)) {
g_model.frsky.storedMah = frskyData.hub.currentConsumption; g_model.frsky.storedMah = frskyData.hub.currentConsumption;
eeDirty(EE_MODEL); eeDirty(EE_MODEL);
} }
@ -4376,20 +4378,24 @@ void opentxClose()
} }
#endif #endif
saveTimers();
#if defined(PCBSKY9X) #if defined(PCBSKY9X)
uint32_t mAhUsed = g_eeGeneral.mAhUsed + Current_used * (488 + g_eeGeneral.currentCalib) / 8192 / 36; uint32_t mAhUsed = g_eeGeneral.mAhUsed + Current_used * (488 + g_eeGeneral.currentCalib) / 8192 / 36;
if (g_eeGeneral.mAhUsed != mAhUsed) if (g_eeGeneral.mAhUsed != mAhUsed) {
g_eeGeneral.mAhUsed = mAhUsed; g_eeGeneral.mAhUsed = mAhUsed;
}
#endif #endif
#if defined(CPUARM) && !defined(REVA) #if defined(PCBTARANIS)
if (sessionTimer > 0) if ((g_model.nPotsToWarn >> 6) == 2) {
g_eeGeneral.globalTimer += sessionTimer; for (uint8_t i=0; i<NUM_POTS ; i++)
if (!(g_model.nPotsToWarn & (1 << i)))
g_model.potPosition[i] = getValue(MIXSRC_FIRST_POT+i) >> 3;
eeDirty(EE_MODEL);
}
#endif #endif
g_eeGeneral.unexpectedShutdown = 0; g_eeGeneral.unexpectedShutdown = 0;
eeDirty(EE_GENERAL); eeDirty(EE_GENERAL);
eeCheck(true); eeCheck(true);
} }
@ -4981,23 +4987,9 @@ void saveTimers()
} }
} }
#if !defined(CPUM2560) #if defined(CPUARM) && !defined(REVA)
if((g_model.frsky.mAhPersistent) && (g_model.frsky.storedMah != frskyData.hub.currentConsumption)) { if (sessionTimer > 0) {
g_model.frsky.storedMah = frskyData.hub.currentConsumption; g_eeGeneral.globalTimer += sessionTimer;
eeDirty(EE_MODEL);
}
else if((!g_model.frsky.mAhPersistent) && (g_model.frsky.storedMah != 0)){
g_model.frsky.storedMah = 0;
eeDirty(EE_MODEL);
}
#endif
#if defined(PCBTARANIS)
if((g_model.nPotsToWarn >> 6) == 2) {
for (uint8_t i=0; i<NUM_POTS ; i++)
if(!(g_model.nPotsToWarn & (1 << i)))
g_model.potPosition[i] = getValue(MIXSRC_FIRST_POT+i) >> 3;
eeDirty(EE_MODEL);
} }
#endif #endif
} }