From 8296f508dedafe56f42daeddf794410677280684 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Sat, 11 Jul 2015 10:46:46 +0200
Subject: [PATCH] Fixes #2451

---
 companion/src/modeledit/customfunctions.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/companion/src/modeledit/customfunctions.cpp b/companion/src/modeledit/customfunctions.cpp
index d39284cdd..289def525 100644
--- a/companion/src/modeledit/customfunctions.cpp
+++ b/companion/src/modeledit/customfunctions.cpp
@@ -701,7 +701,10 @@ void CustomFunctionsPanel::populateFuncParamCB(QComboBox *b, uint function, unsi
   else if (function==FuncReset) {
     qs.append( QObject::tr("Timer1"));
     qs.append( QObject::tr("Timer2"));
-    qs.append( QObject::tr("All"));
+    if (IS_ARM(firmware->getBoard())) {
+      qs.append( QObject::tr("Timer3"));
+    }
+    qs.append( QObject::tr("Flight"));
     qs.append( QObject::tr("Telemetry"));
     int reCount = firmware->getCapability(RotaryEncoders);
     if (reCount == 1) {
@@ -711,6 +714,14 @@ void CustomFunctionsPanel::populateFuncParamCB(QComboBox *b, uint function, unsi
       qs.append( QObject::tr("REa"));
       qs.append( QObject::tr("REb"));
     }
+    if (IS_ARM(firmware->getBoard())) {
+      for (int i=0; i<C9X_MAX_SENSORS; ++i) {
+        if (model->sensorData[i].isAvailable()) {
+          RawSource item = RawSource(SOURCE_TYPE_TELEMETRY, 3*i);
+          qs.append(item.toString(model));
+        }
+      }
+    }
     b->addItems(qs);
     b->setCurrentIndex(value);
   }