From e9b2a8426103cf365d90faeb6ec068b475f66271 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 5 Sep 2019 08:08:44 +0200
Subject: [PATCH] Fixes #6705

---
 companion/src/firmwares/boards.cpp                    | 2 ++
 radio/src/storage/conversions/conversions_218_219.cpp | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/companion/src/firmwares/boards.cpp b/companion/src/firmwares/boards.cpp
index 8f89e7424..1d417884a 100644
--- a/companion/src/firmwares/boards.cpp
+++ b/companion/src/firmwares/boards.cpp
@@ -338,6 +338,8 @@ int Boards::getCapability(Board::Type board, Board::Capability capability)
     case FactoryInstalledSwitches:
       if (IS_TARANIS_X9E(board))
         return 8;
+      if (IS_HORUS_X12S(board))
+        return 8;
       else
         return getCapability(board, Switches);
 
diff --git a/radio/src/storage/conversions/conversions_218_219.cpp b/radio/src/storage/conversions/conversions_218_219.cpp
index 31d6c90c0..b385f64ae 100644
--- a/radio/src/storage/conversions/conversions_218_219.cpp
+++ b/radio/src/storage/conversions/conversions_218_219.cpp
@@ -131,6 +131,14 @@ void convertModelData_218_to_219(ModelData &model)
   zchar2str(name, oldModel.header.name, LEN_MODEL_NAME);
   TRACE("Model %s conversion from v218 to v219", name);
 
+  for (uint8_t i=0; i<MAX_TIMERS_218; i++) {
+    TimerData & timer = newModel.timers[i];
+    if (timer.mode >= TMRMODE_COUNT)
+      timer.mode = TMRMODE_COUNT + convertSwitch_218_to_219(oldModel.timers[i].mode - TMRMODE_COUNT + 1) - 1;
+    else if (timer.mode < 0)
+      timer.mode = convertSwitch_218_to_219(oldModel.timers[i].mode);
+  }
+
   for (uint8_t i=0; i<MAX_MIXERS_218; i++) {
     memmove(&newModel.mixData[i], &oldModel.mixData[i], sizeof(MixData_v218));
     newModel.mixData[i].srcRaw = convertSource_218_to_219(newModel.mixData[i].srcRaw); // from newModel to avoid overwrite