Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Merge issues

Browse source
This commit is contained in:
bsongis 2014-03-03 16:50:05 +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

2
companion/src/firmwares/opentx/opentxinterface.cpp
View file

@ -368,7 +368,7 @@ int OpenTxInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t varian
version = 216; version = 216;
break; break;
case BOARD_9XRPRO: case BOARD_9XRPRO:
version = 215; version = 216;
break; break;
case BOARD_GRUVIN9X: case BOARD_GRUVIN9X:
version = 216; version = 216;

5
radio/src/opentx.cpp
View file

@ -4531,15 +4531,10 @@ void opentxClose()
hapticOff(); hapticOff();
#endif #endif
<<<<<<< HEAD
#if defined(CPUARM) && defined(FRSKY)
if((g_model.frsky.mAhPersistent) && (g_model.frsky.storedMah != frskyData.hub.currentConsumption)) {
=======
saveTimers(); 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)) {
>>>>>>> origin/next
g_model.frsky.storedMah = frskyData.hub.currentConsumption; g_model.frsky.storedMah = frskyData.hub.currentConsumption;
eeDirty(EE_MODEL); eeDirty(EE_MODEL);
} }