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

Merge issues

Browse Source
This commit is contained in:
bsongis
2014-03-03 16:50:32 +01:00
parent a18953f6a2
commit 8662a4ec68
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.cpp
-5
View File
@@ -4531,15 +4531,10 @@ void opentxClose()
hapticOff();
#endif
<<<<<<< HEAD
#if defined(CPUARM) && defined(FRSKY)
if((g_model.frsky.mAhPersistent) && (g_model.frsky.storedMah != frskyData.hub.currentConsumption)) {
=======
saveTimers();
#if defined(CPUARM) && defined(FRSKY)
if ((g_model.frsky.mAhPersistent) && (g_model.frsky.storedMah != frskyData.hub.currentConsumption)) {
>>>>>>> origin/next
g_model.frsky.storedMah = frskyData.hub.currentConsumption;
eeDirty(EE_MODEL);
}