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

Fixes #1186

Browse Source
This commit is contained in:
bsongis
2014-06-05 19:32:29 +02:00
parent 77e9130c37
commit 35e5faa8ad
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/eeprom_rlc.cpp
+3 -2
View File
@@ -984,8 +984,9 @@ void eeLoadModel(uint8_t id)
#endif
#if defined(CPUARM)
if(g_model.frsky.mAhPersistent)
frskyData.hub.currentConsumption = g_model.frsky.storedMah;
if (g_model.frsky.mAhPersistent) {
frskyData.hub.currentConsumption = g_model.frsky.storedMah;
}
#endif
LOAD_MODEL_CURVES();
radio/src/opentx.cpp
+2 -2
View File
@@ -2441,11 +2441,11 @@ void opentxClose()
saveTimers();
#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;
eeDirty(EE_MODEL);
}
else if((!g_model.frsky.mAhPersistent) && (g_model.frsky.storedMah != 0)){
else if (!g_model.frsky.mAhPersistent && g_model.frsky.storedMah!=0) {
g_model.frsky.storedMah = 0;
eeDirty(EE_MODEL);
}
radio/src/telemetry/frsky.cpp
+4 -1
View File
@@ -587,6 +587,9 @@ void telemetryInit(void)
telemetryPortInit();
#endif
// clear telemetry context
#if 0
// if we call telemetryReset() here we also reset the consumption after model load
// right now I don't see why we call it here
telemetryReset();
#endif
}