diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index 0b9891766..ecd2f488e 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -1415,11 +1415,13 @@ class EEPROMInterface
 
     virtual unsigned long loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index) = 0;
     
-    virtual bool loadModelFromByteArray(ModelData & model, const QByteArray & data) { return false; }
+    virtual bool loadRadioSettings(GeneralSettings & model, const QByteArray & data) { return false; }
+    
+    virtual bool loadModel(ModelData & model, const QByteArray & data) { return false; }
 
     virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc) = 0;
 
-    virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0) = 0;
+    virtual int save(uint8_t * eeprom, RadioData & radioData, uint8_t version=0, uint32_t variant=0) = 0;
 
     virtual int getSize(const ModelData &) = 0;
 
@@ -1621,9 +1623,9 @@ class Firmware {
 
     virtual void addOptions(Option options[]);
 
-    inline int saveEEPROM(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, unsigned int version=0)
+    inline int saveEEPROM(uint8_t * eeprom, RadioData & radioData, uint8_t version=0, uint32_t variant=0)
     {
-      return eepromInterface->save(eeprom, radioData, variant, version);
+      return eepromInterface->save(eeprom, radioData, version, variant);
     }
 
     virtual QString getStampUrl() = 0;
diff --git a/companion/src/firmwares/er9x/er9xinterface.cpp b/companion/src/firmwares/er9x/er9xinterface.cpp
index 74339fafa..88ce3f9bd 100644
--- a/companion/src/firmwares/er9x/er9xinterface.cpp
+++ b/companion/src/firmwares/er9x/er9xinterface.cpp
@@ -100,15 +100,15 @@ unsigned long Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 
   Er9xGeneral er9xGeneral;
   memset(&er9xGeneral,0,sizeof(er9xGeneral));
-  if(!loadGeneralDataXML(&doc, &er9xGeneral)) {
+  if (!loadRadioSettingsDataXML(&doc, &er9xGeneral)) {
     errors.set(UNKNOWN_ERROR);
     return errors.to_ulong();
-  } else {
+  }
+  else {
     radioData.generalSettings=er9xGeneral;
     std::cout << "version " << (unsigned int)er9xGeneral.myVers << " ";
   }
-  for(int i=0; i<getMaxModels(); i++)
-  {
+  for (int i=0; i<getMaxModels(); i++) {
     Er9xModelData er9xModel;
     memset(&er9xModel,0,sizeof(er9xModel));
     if(loadModelDataXML(&doc, &er9xModel, i)) {
@@ -200,14 +200,6 @@ unsigned long Er9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, i
   return errors.to_ulong();
 }
 
-int Er9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
-{
-  std::cout << "NO!\n";
-  // TODO an error
-
-  return 0;
-}
-
 int Er9xInterface::getSize(const ModelData &model)
 {
   return 0;
@@ -279,7 +271,7 @@ QDomElement Er9xInterface::getModelDataXML(QDomDocument * qdoc, Er9xModelData *
   return md;
 }
 
-bool Er9xInterface::loadGeneralDataXML(QDomDocument * qdoc, Er9xGeneral * tgen)
+bool Er9xInterface::loadRadioSettingsDataXML(QDomDocument * qdoc, Er9xGeneral * tgen)
 {
   //look for "GENERAL_DATA" tag
   QDomElement gde = qdoc->elementsByTagName("GENERAL_DATA").at(0).toElement();
diff --git a/companion/src/firmwares/er9x/er9xinterface.h b/companion/src/firmwares/er9x/er9xinterface.h
index cf8f22b2e..fbde7e781 100644
--- a/companion/src/firmwares/er9x/er9xinterface.h
+++ b/companion/src/firmwares/er9x/er9xinterface.h
@@ -20,9 +20,11 @@
 
 #ifndef _ER9XINTERFACE_H_
 #define _ER9XINTERFACE_H_
+
 #include <QtXml>
 #include "eeprominterface.h"
 #include "er9xeeprom.h"
+
 class RleFile;
 
 class Er9xInterface : public EEPROMInterface
@@ -45,7 +47,10 @@ class Er9xInterface : public EEPROMInterface
 
     virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
 
-    virtual int save(uint8_t * eeprom, RadioData & radioData, uint32_t variant=0, uint8_t version=0);
+    virtual int save(uint8_t * eeprom, RadioData & radioData, uint8_t version=0, uint32_t variant=0)
+    {
+      return 0;
+    }
 
     virtual int getSize(const ModelData &);
 
@@ -55,7 +60,7 @@ class Er9xInterface : public EEPROMInterface
 
   protected:
 
-    RleFile *efile;
+    RleFile * efile;
 
   private:
     void appendTextElement(QDomDocument * qdoc, QDomElement * pe, QString name, QString value);
@@ -68,7 +73,7 @@ class Er9xInterface : public EEPROMInterface
 
     QDomElement getModelDataXML(QDomDocument * qdoc, Er9xModelData * tmod, int modelNum, int mdver); //parse out data to XML format
 
-    bool loadGeneralDataXML(QDomDocument * qdoc, Er9xGeneral * tgen); // get data from XML
+    bool loadRadioSettingsDataXML(QDomDocument * qdoc, Er9xGeneral * tgen); // get data from XML
 
     bool loadModelDataXML(QDomDocument * qdoc, Er9xModelData * tmod, int modelNum = -1); // get data from XML
 
diff --git a/companion/src/firmwares/ersky9x/ersky9xinterface.cpp b/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
index 03fea1ed3..fce7850ee 100644
--- a/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
+++ b/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
@@ -130,7 +130,7 @@ unsigned long Ersky9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 
   Ersky9xGeneral ersky9xGeneral;
   memset(&ersky9xGeneral,0,sizeof(ersky9xGeneral));
-  if(!loadGeneralDataXML(&doc, &ersky9xGeneral)) {
+  if(!loadRadioSettingsDataXML(&doc, &ersky9xGeneral)) {
     errors.set(UNKNOWN_ERROR);
     return errors.to_ulong();
   }
@@ -244,14 +244,6 @@ unsigned long Ersky9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom
   return errors.to_ulong();
 }
 
-int Ersky9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
-{
-  std::cout << "NO!\n";
-  // TODO an error
-
-  return 0;
-}
-
 int Ersky9xInterface::getSize(const ModelData & model)
 {
   return 0;
@@ -323,7 +315,7 @@ QDomElement Ersky9xInterface::getModelDataXML(QDomDocument * qdoc, Ersky9xModelD
   return md;
 }
 
-bool Ersky9xInterface::loadGeneralDataXML(QDomDocument * qdoc, Ersky9xGeneral * tgen)
+bool Ersky9xInterface::loadRadioSettingsDataXML(QDomDocument * qdoc, Ersky9xGeneral * tgen)
 {
   //look for "GENERAL_DATA" tag
   QDomElement gde = qdoc->elementsByTagName("GENERAL_DATA").at(0).toElement();
diff --git a/companion/src/firmwares/ersky9x/ersky9xinterface.h b/companion/src/firmwares/ersky9x/ersky9xinterface.h
index dce363651..561580b2e 100644
--- a/companion/src/firmwares/ersky9x/ersky9xinterface.h
+++ b/companion/src/firmwares/ersky9x/ersky9xinterface.h
@@ -20,9 +20,11 @@
 
 #ifndef _ERSKY9XINTERFACE_H_
 #define _ERSKY9XINTERFACE_H_
+
 #include <QtXml>
 #include "eeprominterface.h"
 #include "ersky9xeeprom.h"
+
 class RleFile;
 
 class Ersky9xInterface : public EEPROMInterface
@@ -45,7 +47,10 @@ class Ersky9xInterface : public EEPROMInterface
 
     virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
 
-    virtual int save(uint8_t * eeprom, RadioData & radioData, uint32_t variant=0, uint8_t version=0);
+    virtual int save(uint8_t * eeprom, RadioData & radioData, uint8_t version=0, uint32_t variant=0)
+    {
+      return 0;
+    }
 
     virtual int getSize(const ModelData &);
     
@@ -55,7 +60,7 @@ class Ersky9xInterface : public EEPROMInterface
 
   protected:
 
-    RleFile *efile;
+    RleFile * efile;
 
   private:
     void appendTextElement(QDomDocument * qdoc, QDomElement * pe, QString name, QString value);
@@ -68,7 +73,7 @@ class Ersky9xInterface : public EEPROMInterface
     
     QDomElement getModelDataXML(QDomDocument * qdoc, Ersky9xModelData_v11 * tmod, int modelNum, int mdver); //parse out data to XML format
     
-    bool loadGeneralDataXML(QDomDocument * qdoc, Ersky9xGeneral * tgen); // get data from XML
+    bool loadRadioSettingsDataXML(QDomDocument * qdoc, Ersky9xGeneral * tgen); // get data from XML
     
     template <class T>
     bool loadModelDataXML(QDomDocument * qdoc, ModelData * model, int modelNum, int stickMode); // get data from XML
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 53939cb17..3fad124c9 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -108,10 +108,9 @@ const int OpenTxEepromInterface::getEEpromSize()
     case BOARD_TARANIS_X9DP:
     case BOARD_TARANIS_X9E:
     case BOARD_FLAMENCO:
-    case BOARD_HORUS:
       return EESIZE_TARANIS;
     default:
-      return 0;
+      return 0; // unlimited
   }
 }
 
@@ -127,10 +126,9 @@ const int OpenTxEepromInterface::getMaxModels()
     return 16;
 }
 
-template <class T>
-bool OpenTxEepromInterface::loadModelVariant(unsigned int index, ModelData & model, uint8_t *data, unsigned int version, unsigned int variant)
+bool OpenTxEepromInterface::loadModel(uint8_t version, ModelData & model, uint8_t * data, int index, unsigned int variant)
 {
-  T open9xModel(model, board, version, variant);
+  OpenTxModelData modelDataFactory(model, board, version, variant);
 
   if (!data) {
     // load from EEPROM
@@ -138,8 +136,8 @@ bool OpenTxEepromInterface::loadModelVariant(unsigned int index, ModelData & mod
     efile->openRd(FILE_MODEL(index));
     int numbytes = efile->readRlc2((uint8_t *)eepromData.data(), eepromData.size());
     if (numbytes) {
-      open9xModel.Import(eepromData);
-      // open9xModel.Dump();
+      modelDataFactory.Import(eepromData);
+      // modelDataFactory.Dump();
       model.used = true;
     }
     else {
@@ -155,8 +153,8 @@ bool OpenTxEepromInterface::loadModelVariant(unsigned int index, ModelData & mod
     else
       importRlc(modelData, backupData);
     if (modelData.size()) {
-      open9xModel.Import(modelData);
-      // open9xModel.Dump();
+      modelDataFactory.Import(modelData);
+      // modelDataFactory.Dump();
       model.used = true;
     }
     else {
@@ -167,7 +165,17 @@ bool OpenTxEepromInterface::loadModelVariant(unsigned int index, ModelData & mod
   return true;
 }
 
-bool OpenTxEepromInterface::loadModelFromByteArray(ModelData & model, const QByteArray & data)
+bool OpenTxEepromInterface::loadRadioSettings(GeneralSettings & settings, const QByteArray & data)
+{
+  // TODO check the 8 first bytes (fourcc + version + 'M' + size)
+  QByteArray raw = data.right(data.size() - 8);
+  OpenTxGeneralData importer(settings, board, 218, 0); // TODO board and 218 should be the version taken from the header
+  importer.Import(raw);
+  importer.Dump(); // Dumps the structure so that it's easy to check with firmware datastructs.h
+  return true;
+}
+
+bool OpenTxEepromInterface::loadModel(ModelData & model, const QByteArray & data)
 {
   // TODO check the 8 first bytes (fourcc + version + 'M' + size)
   QByteArray raw = data.right(data.size() - 8);
@@ -178,16 +186,10 @@ bool OpenTxEepromInterface::loadModelFromByteArray(ModelData & model, const QByt
   return true;
 }
 
-bool OpenTxEepromInterface::loadModel(uint8_t version, ModelData &model, uint8_t *data, int index, unsigned int variant, unsigned int stickMode)
-{
-  return loadModelVariant<OpenTxModelData>(index, model, data, version, variant);
-}
-
-template <class T>
-bool OpenTxEepromInterface::loadGeneral(GeneralSettings &settings, unsigned int version)
+bool OpenTxEepromInterface::loadRadioSettings(GeneralSettings & settings, uint8_t version)
 {
   QByteArray eepromData(sizeof(settings), 0); // GeneralSettings should be always bigger than the EEPROM struct
-  T open9xSettings(settings, board, version);
+  OpenTxGeneralData open9xSettings(settings, board, version);
   efile->openRd(FILE_GENERAL);
   int sz = efile->readRlc2((uint8_t *)eepromData.data(), eepromData.size());
   if (sz) {
@@ -200,7 +202,7 @@ bool OpenTxEepromInterface::loadGeneral(GeneralSettings &settings, unsigned int
 }
 
 template <class T>
-bool OpenTxEepromInterface::saveGeneral(GeneralSettings &settings, BoardEnum board, uint32_t version, uint32_t variant)
+bool OpenTxEepromInterface::saveRadioSettings(GeneralSettings & settings, BoardEnum board, uint8_t version, uint32_t variant)
 {
   T open9xSettings(settings, board, version, variant);
   // open9xSettings.Dump();
@@ -211,7 +213,7 @@ bool OpenTxEepromInterface::saveGeneral(GeneralSettings &settings, BoardEnum boa
 }
 
 template <class T>
-bool OpenTxEepromInterface::saveModel(unsigned int index, ModelData &model, unsigned int version, unsigned int variant)
+bool OpenTxEepromInterface::saveModel(unsigned int index, ModelData & model, uint8_t version, uint32_t variant)
 {
   T open9xModel(model, board, version, variant);
   // open9xModel.Dump();
@@ -286,7 +288,7 @@ unsigned long OpenTxEepromInterface::load(RadioData & radioData, const uint8_t *
     return errors.to_ulong();
   }
 
-  if (!loadGeneral<OpenTxGeneralData>(radioData.generalSettings, version)) {
+  if (!loadRadioSettings(radioData.generalSettings, version)) {
     std::cout << " ko\n";
     errors.set(UNKNOWN_ERROR);
     return errors.to_ulong();
@@ -294,7 +296,7 @@ unsigned long OpenTxEepromInterface::load(RadioData & radioData, const uint8_t *
 
   std::cout << " variant " << radioData.generalSettings.variant;
   for (int i=0; i<getMaxModels(); i++) {
-    if (!loadModel(version, radioData.models[i], NULL, i, radioData.generalSettings.variant, radioData.generalSettings.stickMode+1)) {
+    if (!loadModel(version, radioData.models[i], NULL, i, radioData.generalSettings.variant)) {
       std::cout << " ko\n";
       errors.set(UNKNOWN_ERROR);
       return errors.to_ulong();
@@ -305,12 +307,12 @@ unsigned long OpenTxEepromInterface::load(RadioData & radioData, const uint8_t *
   return errors.to_ulong();
 }
 
-int OpenTxEepromInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
+int OpenTxEepromInterface::save(uint8_t * eeprom, RadioData & radioData, uint8_t version, uint32_t variant)
 {
   EEPROMWarnings.clear();
 
-  if (!version) {
-    switch(board) {
+  if (version == 0) {
+    switch (board) {
       case BOARD_X7D:
       case BOARD_TARANIS_X9D:
       case BOARD_TARANIS_X9DP:
@@ -346,7 +348,7 @@ int OpenTxEepromInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t
     variant |= TARANIS_X9E_VARIANT;
   }
 
-  int result = saveGeneral<OpenTxGeneralData>(radioData.generalSettings, board, version, variant);
+  int result = saveRadioSettings<OpenTxGeneralData>(radioData.generalSettings, board, version, variant);
   if (!result) {
     return 0;
   }
diff --git a/companion/src/firmwares/opentx/opentxinterface.h b/companion/src/firmwares/opentx/opentxinterface.h
index c2a62782f..df3a25de6 100644
--- a/companion/src/firmwares/opentx/opentxinterface.h
+++ b/companion/src/firmwares/opentx/opentxinterface.h
@@ -41,9 +41,13 @@ class OpenTxEepromInterface : public EEPROMInterface
 
     virtual unsigned long loadBackup(RadioData &, uint8_t *eeprom, int esize, int index);
 
-    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
-
-    virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0);
+    virtual unsigned long loadxml(RadioData & radioData, QDomDocument & doc);
+    
+    virtual bool loadRadioSettings(GeneralSettings & model, const QByteArray & data);
+    
+    virtual bool loadModel(ModelData & model, const QByteArray & data);
+    
+    virtual int save(uint8_t * eeprom, RadioData & radioData, uint8_t version=0, uint32_t variant=0);
 
     virtual int getSize(const ModelData &);
 
@@ -57,24 +61,15 @@ class OpenTxEepromInterface : public EEPROMInterface
 
     bool checkVariant(unsigned int version, unsigned int variant);
     
-    bool loadModelFromByteArray(ModelData & model, const QByteArray & data);
-      
-    template <class T>
-    bool loadModel(ModelData &model, uint8_t *data, int index, unsigned int stickMode=0);
+    bool loadModel(uint8_t version, ModelData &model, uint8_t *data, int index, unsigned int variant);
 
     template <class T>
-    bool loadModelVariant(unsigned int index, ModelData &model, uint8_t *data, unsigned int version, unsigned int variant);
+    bool saveModel(unsigned int index, ModelData & model, uint8_t version, uint32_t variant);
 
-    bool loadModel(uint8_t version, ModelData &model, uint8_t *data, int index, unsigned int variant, unsigned int stickMode=0);
+    bool loadRadioSettings(GeneralSettings & settings, uint8_t version);
 
     template <class T>
-    bool saveModel(unsigned int index, ModelData &model, unsigned int version, unsigned int variant);
-
-    template <class T>
-    bool loadGeneral(GeneralSettings &settings, unsigned int version);
-
-    template <class T>
-    bool saveGeneral(GeneralSettings &settings, BoardEnum board, uint32_t version, uint32_t variant);
+    bool saveRadioSettings(GeneralSettings & settings, BoardEnum board, uint8_t version, uint32_t variant);
 
     RleFile *efile;
 
diff --git a/companion/src/flasheepromdialog.cpp b/companion/src/flasheepromdialog.cpp
index b689dd5f9..249479736 100644
--- a/companion/src/flasheepromdialog.cpp
+++ b/companion/src/flasheepromdialog.cpp
@@ -297,7 +297,7 @@ void FlashEEpromDialog::on_burnButton_clicked()
     QString filename = generateProcessUniqueTempFileName("temp.bin");
     QFile file(filename);
     uint8_t *eeprom = (uint8_t*)malloc(GetEepromInterface()->getEEpromSize());
-    int eeprom_size = GetEepromInterface()->save(eeprom, *radioData, GetCurrentFirmware()->getVariantNumber());
+    int eeprom_size = GetEepromInterface()->save(eeprom, *radioData, 0, GetCurrentFirmware()->getVariantNumber());
     if (!eeprom_size) {
       QMessageBox::warning(this, tr("Error"), tr("Cannot write file %1:\n%2.").arg(filename).arg(file.errorString()));
       return;
diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp
index a745eb46d..0b55311cc 100644
--- a/companion/src/helpers.cpp
+++ b/companion/src/helpers.cpp
@@ -31,6 +31,7 @@
 #include "simulatordialog.h"
 #include "simulatorinterface.h"
 #include "firmwareinterface.h"
+#include "storage/storage_sdcard.h"
 
 Stopwatch gStopwatch("global");
 
@@ -805,8 +806,9 @@ CompanionIcon::CompanionIcon(const QString &baseimage)
 
 void startSimulation(QWidget * parent, RadioData & radioData, int modelIdx)
 {
-  SimulatorInterface * si = GetCurrentFirmwareSimulator();
-  if (si) {
+  Firmware * firmware = GetCurrentFirmware();
+  SimulatorInterface * simulator = GetCurrentFirmwareSimulator();
+  if (simulator) {
     RadioData * simuData = new RadioData(radioData);
     unsigned int flags = 0;
     if (modelIdx >= 0) {
@@ -817,12 +819,19 @@ void startSimulation(QWidget * parent, RadioData & radioData, int modelIdx)
       flags |= SIMULATOR_FLAGS_STICK_MODE_LEFT;
     }
     BoardEnum board = GetCurrentFirmware()->getBoard();
-    SimulatorDialog * sd;
+    SimulatorDialog * dialog;
     if (board == BOARD_HORUS) {
-      sd = new SimulatorDialogHorus(parent, si, flags);
+      dialog = new SimulatorDialogHorus(parent, simulator, flags);
+      StorageSdcard storage;
+      QString sdPath = g.profile[g.id()].sdPath();
+      storage.write(sdPath);
+      dialog->start(NULL);
     }
     else if (board == BOARD_FLAMENCO) {
-      sd = new SimulatorDialogFlamenco(parent, si, flags);
+      dialog = new SimulatorDialogFlamenco(parent, simulator, flags);
+      QByteArray eeprom(GetEepromInterface()->getEEpromSize(), 0);
+      firmware->saveEEPROM((uint8_t *)eeprom.data(), *simuData);
+      dialog->start(eeprom);
     }
     else if (board == BOARD_TARANIS_X9D || board == BOARD_TARANIS_X9DP || board == BOARD_TARANIS_X9E) {
       for (int i=0; i<GetCurrentFirmware()->getCapability(Pots); i++) {
@@ -833,17 +842,21 @@ void startSimulation(QWidget * parent, RadioData & radioData, int modelIdx)
           }
         }
       }
-      sd = new SimulatorDialogTaranis(parent, si, flags);
+      dialog = new SimulatorDialogTaranis(parent, simulator, flags);
+      QByteArray eeprom(GetEepromInterface()->getEEpromSize(), 0);
+      firmware->saveEEPROM((uint8_t *)eeprom.data(), *simuData);
+      dialog->start(eeprom);
     }
     else {
-      sd = new SimulatorDialog9X(parent, si, flags);
+      dialog = new SimulatorDialog9X(parent, simulator, flags);
+      QByteArray eeprom(GetEepromInterface()->getEEpromSize(), 0);
+      firmware->saveEEPROM((uint8_t *)eeprom.data(), *simuData, 0, firmware->getCapability(SimulatorVariant));
+      dialog->start(eeprom);
     }
-    QByteArray eeprom(GetEepromInterface()->getEEpromSize(), 0);
-    GetEepromInterface()->save((uint8_t *)eeprom.data(), *simuData, GetCurrentFirmware()->getCapability(SimulatorVariant));
+    
+    dialog->exec();
+    delete dialog;
     delete simuData;
-    sd->start(eeprom);
-    sd->exec();
-    delete sd;
   }
   else {
     QMessageBox::warning(NULL,
diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp
index 80b3fd4a5..269d27a9c 100644
--- a/companion/src/mdichild.cpp
+++ b/companion/src/mdichild.cpp
@@ -336,19 +336,24 @@ bool MdiChild::loadFile(const QString & fileName, bool resetCurrentFile)
     }
 
     ui->modelsList->refreshList();
-    if (resetCurrentFile) setCurrentFile(fileName);
+    if (resetCurrentFile)
+      setCurrentFile(fileName);
 
     free(eeprom);
     return true;
   }
   else if (fileType == FILE_TYPE_OTX) { //read zip archive
-    return loadOtxFile(fileName, resetCurrentFile);
+    if (loadOtxFile(fileName)) {
+      ui->modelsList->refreshList();
+      if (resetCurrentFile)
+        setCurrentFile(fileName);
+    }
   }
 
   return false;
 }
 
-bool MdiChild::loadOtxFile(const QString &fileName, bool resetCurrentFile)
+bool MdiChild::loadOtxFile(const QString & fileName)
 {
   // example of StorageSdcard usage
 
@@ -375,16 +380,12 @@ bool MdiChild::loadOtxFile(const QString &fileName, bool resetCurrentFile)
   }
 #endif
   
-  for (QList<ModelFile>::iterator i = storage.models.begin(); i != storage.models.end(); ++i) {
-    GetEepromInterface()->loadModelFromByteArray(radioData.models[0], i->data);
+  int index = 0;
+  for (QList<ModelFile>::iterator i = storage.models.begin(); i != storage.models.end(); ++i, ++index) {
+    GetEepromInterface()->loadModel(radioData.models[index], i->data);
   }
   
-  ui->modelsList->refreshList();
-
-  // for test immediately save to another file
-  // storage.write(fileName + "test.otx");
   return true;
-
 }
 
 bool MdiChild::save()
@@ -437,11 +438,11 @@ bool MdiChild::saveFile(const QString &fileName, bool setCurrent)
 
   int fileType = getFileType(myFile);
 
-  uint8_t *eeprom = (uint8_t*)malloc(GetEepromInterface()->getEEpromSize());
+  uint8_t * eeprom = (uint8_t*)malloc(GetEepromInterface()->getEEpromSize());
   int eeprom_size = 0;
 
   if (fileType != FILE_TYPE_XML) {
-    eeprom_size = GetEepromInterface()->save(eeprom, radioData, GetCurrentFirmware()->getVariantNumber(), 0/*last version*/);
+    eeprom_size = GetEepromInterface()->save(eeprom, radioData, 0, GetCurrentFirmware()->getVariantNumber());
     if (!eeprom_size) {
       QMessageBox::warning(this, tr("Error"),tr("Cannot write file %1:\n%2.").arg(myFile).arg(file.errorString()));
       return false;
diff --git a/companion/src/mdichild.h b/companion/src/mdichild.h
index 2bcd0dedc..0bfbf67d2 100644
--- a/companion/src/mdichild.h
+++ b/companion/src/mdichild.h
@@ -43,15 +43,14 @@ class MdiChild : public QWidget
     ~MdiChild();
 
     void newFile();
-    bool loadFile(const QString &fileName, bool resetCurrentFile=true);
+    bool loadFile(const QString & fileName, bool resetCurrentFile=true);
     bool loadBackup();
     bool save();
     bool saveAs(bool isNew=false);
-    bool saveFile(const QString &fileName, bool setCurrent=true);
+    bool saveFile(const QString & fileName, bool setCurrent=true);
     bool hasSelection();
     QString userFriendlyCurrentFile();
     QString currentFile() { return curFile; }
-    // void keyPressEvent(QKeyEvent *event);
     bool hasPasteData();
     void viableModelSelected(bool viable);
     void eepromInterfaceChanged();
@@ -62,7 +61,7 @@ class MdiChild : public QWidget
     void copyAvailable(bool val);
 
   protected:
-    void closeEvent(QCloseEvent *event);
+    void closeEvent(QCloseEvent * event);
 
   private slots:
     void documentWasModified();
@@ -87,13 +86,11 @@ class MdiChild : public QWidget
 
   private:
     bool maybeSave();
-    void setCurrentFile(const QString &fileName);
-    QString strippedName(const QString &fullFileName);
-    void saveSelection();
-    void restoreSelection();
-    bool loadOtxFile(const QString &fileName, bool resetCurrentFile);
+    void setCurrentFile(const QString & fileName);
+    QString strippedName(const QString & fullFileName);
+    bool loadOtxFile(const QString & fileName);
 
-    Ui::mdiChild *ui;
+    Ui::mdiChild * ui;
 
     QString curFile;
 
diff --git a/companion/src/simulation/simulatordialoghorus.cpp b/companion/src/simulation/simulatordialoghorus.cpp
index 82c588309..b8b2245a6 100644
--- a/companion/src/simulation/simulatordialoghorus.cpp
+++ b/companion/src/simulation/simulatordialoghorus.cpp
@@ -24,7 +24,7 @@
 
 uint32_t SimulatorDialogHorus::switchstatus = 0;
 
-SimulatorDialogHorus::SimulatorDialogHorus(QWidget * parent, SimulatorInterface *simulator, unsigned int flags):
+SimulatorDialogHorus::SimulatorDialogHorus(QWidget * parent, SimulatorInterface * simulator, unsigned int flags):
   SimulatorDialog(parent, simulator, flags),
   ui(new Ui::SimulatorDialogHorus)
 {
diff --git a/companion/src/simulation/simulatorinterface.h b/companion/src/simulation/simulatorinterface.h
index 25103f485..e05515d34 100644
--- a/companion/src/simulation/simulatorinterface.h
+++ b/companion/src/simulation/simulatorinterface.h
@@ -68,9 +68,9 @@ class SimulatorInterface
 
     virtual void setVolumeGain(int value) { };
 
-    virtual void start(QByteArray &eeprom, bool tests=true) = 0;
+    virtual void start(QByteArray & eeprom, bool tests=true) = 0;
 
-    virtual void start(const char *filename, bool tests=true) = 0;
+    virtual void start(const char * filename, bool tests=true) = 0;
 
     virtual void stop() = 0;
 
diff --git a/companion/src/storage/storage_eeprom.cpp b/companion/src/storage/storage_eeprom.cpp
index 0623d6532..aa3b0a18d 100644
--- a/companion/src/storage/storage_eeprom.cpp
+++ b/companion/src/storage/storage_eeprom.cpp
@@ -22,7 +22,6 @@
 #include "firmwareinterface.h"
 #include "storage_eeprom.h"
 
-
 unsigned long LoadEeprom(RadioData & radioData, const uint8_t * eeprom, const int size)
 {
   std::bitset<NUM_ERRORS> errors;
@@ -86,12 +85,12 @@ unsigned long LoadEepromXml(RadioData & radioData, QDomDocument & doc)
 
 bool convertEEprom(const QString & sourceEEprom, const QString & destinationEEprom, const QString & firmwareFilename)
 {
-  Firmware *currentFirmware = GetCurrentFirmware();
+  Firmware * currentFirmware = GetCurrentFirmware();
   FirmwareInterface firmware(firmwareFilename);
   if (!firmware.isValid())
     return false;
 
-  unsigned int version = firmware.getEEpromVersion();
+  uint8_t version = firmware.getEEpromVersion();
   unsigned int variant = firmware.getEEpromVariant();
 
   QFile sourceFile(sourceEEprom);
@@ -108,8 +107,7 @@ bool convertEEprom(const QString & sourceEEprom, const QString & destinationEEpr
 
   QSharedPointer<RadioData> radioData = QSharedPointer<RadioData>(new RadioData());
   std::bitset<NUM_ERRORS> errors((unsigned long long)LoadEeprom(*radioData, (uint8_t *)eeprom.data(), eeprom_size));
-  if (!errors.test(ALL_OK)
-    || !currentFirmware->saveEEPROM((uint8_t *)eeprom.data(), *radioData, variant, version)) {
+  if (!errors.test(ALL_OK) || !currentFirmware->saveEEPROM((uint8_t *)eeprom.data(), *radioData, version, variant)) {
     return false;
   }
 
diff --git a/companion/src/storage/xmlinterface.cpp b/companion/src/storage/xmlinterface.cpp
index e122da250..22eb460ec 100644
--- a/companion/src/storage/xmlinterface.cpp
+++ b/companion/src/storage/xmlinterface.cpp
@@ -59,7 +59,7 @@ bool XmlInterface::loadxml(RadioData &radioData, QDomDocument &doc)
   return false;
 }
 
-void saveGeneralSettings(GeneralSettings & settings, global_settings & gs)
+void saveRadioSettings(GeneralSettings & settings, global_settings & gs)
 {
   Calibration rudderCalib(settings.calibMid[0], settings.calibSpanNeg[0], settings.calibSpanPos[0]);
   Calibration throttleCalib(settings.calibMid[1], settings.calibSpanNeg[1], settings.calibSpanPos[1]);
@@ -189,7 +189,7 @@ bool XmlInterface::save(RadioData &radioData)
 
     // the general settings
     global_settings gs;
-    saveGeneralSettings(settings, gs);
+    saveRadioSettings(settings, gs);
     r.global_settings(gs);
 
     // the models
diff --git a/radio/src/storage/eeprom_rlc.h b/radio/src/storage/eeprom_rlc.h
index f687a6b9e..7236a76c4 100644
--- a/radio/src/storage/eeprom_rlc.h
+++ b/radio/src/storage/eeprom_rlc.h
@@ -218,7 +218,7 @@ const pm_char * eeRestoreModel(uint8_t i_fileDst, char *model_name);
 
 // For conversions
 #if defined(CPUARM)
-void loadGeneralSettings();
+void loadRadioSettingsSettings();
 void loadModel(int index, bool alarms=true);
 #endif
 
diff --git a/radio/src/storage/sdcard_raw.cpp b/radio/src/storage/sdcard_raw.cpp
index 6fa6e4eb7..e50501eee 100644
--- a/radio/src/storage/sdcard_raw.cpp
+++ b/radio/src/storage/sdcard_raw.cpp
@@ -136,11 +136,11 @@ const char * loadModel(const char * filename, bool alarms)
   return error;
 }
 
-const char * loadGeneralSettings()
+const char * loadRadioSettingsSettings()
 {
   const char * error = loadFile(RADIO_SETTINGS_PATH, (uint8_t *)&g_eeGeneral, sizeof(g_eeGeneral));
   if (error) {
-    TRACE("loadGeneralSettings error=%s", error);
+    TRACE("loadRadioSettingsSettings error=%s", error);
   }
   // TODO this is temporary, we only have one model for now
   return error;
@@ -176,7 +176,7 @@ void storageReadAll()
 {
   TRACE("storageReadAll");
   
-  if (loadGeneralSettings() != NULL) {
+  if (loadRadioSettingsSettings() != NULL) {
     storageEraseAll(true);
   }