From 7ce3eb446012751fe7eea6b5bec5bbbd7d7c1bc8 Mon Sep 17 00:00:00 2001 From: bsongis Date: Mon, 2 Jun 2014 11:53:25 +0200 Subject: [PATCH] Fixes #1168 --- radio/src/eeprom_conversions.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp index 1a0681898..ecd8d1001 100644 --- a/radio/src/eeprom_conversions.cpp +++ b/radio/src/eeprom_conversions.cpp @@ -838,6 +838,15 @@ void ConvertModel_215_to_216(ModelData &model) memcpy(&g_model.frsky, &oldModel.frsky, 2*sizeof(FrSkyChannelData)); // gap for A3-A4 memcpy(((uint8_t *)&g_model.frsky) + 4*sizeof(FrSkyChannelData), ((uint8_t *)&oldModel.frsky) + 2*sizeof(FrSkyChannelData), sizeof(oldModel.frsky) - 2*sizeof(FrSkyChannelData)); + // RxBatt introduced + if (g_model.frsky.voltsSource >= FRSKY_VOLTS_SOURCE_A1) + g_model.frsky.voltsSource += 1; + // A3 and A4 introduced + if (g_model.frsky.voltsSource >= FRSKY_VOLTS_SOURCE_A3) + g_model.frsky.voltsSource += 2; + if (g_model.frsky.currentSource >= FRSKY_CURRENT_SOURCE_A3) + g_model.frsky.currentSource += 2; + for (int i=0; i<3; i++) { if (g_model.frsky.screensType & (1<