From daa74368e1748f5962a2696b2bee20a89e0b6189 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Mon, 3 Oct 2011 06:48:35 +0000
Subject: [PATCH] Conversions from er9x last version should be ok

---
 src/myeeprom.h |  4 ++--
 src/pers.cpp   | 16 +++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/myeeprom.h b/src/myeeprom.h
index b923d7cfa..3f8fd91d7 100644
--- a/src/myeeprom.h
+++ b/src/myeeprom.h
@@ -36,8 +36,8 @@
 #define WARN_MEM     (!(g_eeGeneral.warnOpts & WARN_MEM_BIT))
 #define BEEP_VAL     ( (g_eeGeneral.warnOpts & WARN_BVAL_BIT) >>3 )
 
-#define EEPROM_ER9X_VER  4
-#define EEPROM_ER9X_r751 9
+#define EEPROM_ER9X_MIN  4
+#define EEPROM_ER9X_MAX  9
 
 #define EEPROM_VER_r584  3
 #define EEPROM_VER_r751  5
diff --git a/src/pers.cpp b/src/pers.cpp
index 29a39a588..32b7a1295 100644
--- a/src/pers.cpp
+++ b/src/pers.cpp
@@ -57,8 +57,8 @@ void generalDefault()
 #ifdef TRANSLATIONS
 uint8_t Translate()
 {
-  if (g_eeGeneral.myVers == EEPROM_VER_r584 || g_eeGeneral.myVers == EEPROM_ER9X_VER) {
-    alert(g_eeGeneral.myVers == EEPROM_VER_r584 ? PSTR("EEprom Data v3") : PSTR("EEprom Data Er9x v4"), true);
+  if (g_eeGeneral.myVers == EEPROM_VER_r584 || (g_eeGeneral.myVers >= EEPROM_ER9X_MIN && g_eeGeneral.myVers <= EEPROM_ER9X_MAX)) {
+    alert(g_eeGeneral.myVers == EEPROM_VER_r584 ? PSTR("EEprom Data v3") : PSTR("EEprom Data Er9x"), true);
     message(PSTR("EEPROM Converting"));
     theFile.readRlc1((uint8_t*)&g_eeGeneral, sizeof(g_eeGeneral));
     memset(&g_eeGeneral.frskyRssiAlarms, 0 , sizeof(g_eeGeneral.frskyRssiAlarms));
@@ -107,12 +107,10 @@ uint8_t Translate()
         g_model.trimInc = v3->trimInc;
         g_model.spare1 = 0;
         g_model.pulsePol = v3->pulsePol;
-        if (g_eeGeneral.myVers == EEPROM_ER9X_VER) {
-          g_model.extendedLimits = v4->extendedLimits;
-        }
-        else {
+        if (g_eeGeneral.myVers == EEPROM_VER_r584)
           g_model.extendedLimits = 0;
-        }
+        else
+          g_model.extendedLimits = v4->extendedLimits;
         g_model.extendedTrims = 0;
         g_model.spare2 = 0;
         g_model.ppmDelay = v3->ppmDelay;
@@ -194,11 +192,11 @@ uint8_t Translate()
         }
         for (uint8_t i=0; i<NUM_STICKS; i++)
           setTrimValue(0, i, trims[i]);
-        theFile.writeRlc(FILE_MODEL(id), FILE_TYP_MODEL, (uint8_t*)&g_model, sizeof(g_model), true);
+        theFile.writeRlc(FILE_MODEL(id), FILE_TYP_MODEL, (uint8_t*)&g_model, sizeof(g_model), 200);
       }
     }
     g_eeGeneral.myVers = EEPROM_VER;
-    theFile.writeRlc(FILE_GENERAL, FILE_TYP_GENERAL, (uint8_t*)&g_eeGeneral, sizeof(EEGeneral), true);
+    theFile.writeRlc(FILE_GENERAL, FILE_TYP_GENERAL, (uint8_t*)&g_eeGeneral, sizeof(EEGeneral), 200);
     return sizeof(EEGeneral);
   }