From 8a32e769dc70b558d97730c10077550dd35b5651 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 23 Jan 2014 11:49:13 +0100
Subject: [PATCH] [9x stock] Issue #542 - 12 bytes here

---
 radio/src/opentx.cpp    |  7 +++++++
 radio/src/templates.cpp | 11 +++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index b4900f8d1..a126db79d 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -509,6 +509,12 @@ uint16_t evalChkSum()
   return sum;
 }
 
+#if defined(TEMPLATES)
+inline void applyDefaultTemplate()
+{
+  applyTemplate(TMPL_SIMPLE_4CH);
+}
+#else
 void applyDefaultTemplate()
 {
   for (int i=0; i<NUM_STICKS; i++) {
@@ -539,6 +545,7 @@ void applyDefaultTemplate()
   }
   eeDirty(EE_MODEL);
 }
+#endif
 
 #if defined(PXX) && defined(CPUARM)
 void checkModelIdUnique(uint8_t id)
diff --git a/radio/src/templates.cpp b/radio/src/templates.cpp
index e5b10dad1..a4cd243a5 100644
--- a/radio/src/templates.cpp
+++ b/radio/src/templates.cpp
@@ -178,7 +178,13 @@ void applyTemplate(uint8_t idx)
       // Simple 4-Ch
       case TMPL_SIMPLE_4CH:
         clearInputs();
-        applyDefaultTemplate();
+#if defined(PCBTARANIS)
+  #pragma message("Templates with virtual inputs (FrSky Taranis) are not implemented!")
+#endif
+        setDest(ICC(STK_RUD), MIXSRC_Rud);
+        setDest(ICC(STK_ELE), MIXSRC_Ele);
+        setDest(ICC(STK_THR), MIXSRC_Thr);
+        setDest(ICC(STK_AIL), MIXSRC_Ail);
         break;
 
       // Sticky-T-Cut
@@ -203,9 +209,6 @@ void applyTemplate(uint8_t idx)
       // Elevon\\Delta
       case TMPL_ELEVON_DELTA:
         defaultInputs();
-#if defined(PCBTARANIS)
- #pragma message("Templates below are not implemented (only V-TAIL has been done). Feel free to help!")
-#endif
         setDest(ICC(STK_ELE), MIXSRC_Ele, true);
         setDest(ICC(STK_ELE), MIXSRC_Ail);
         setDest(ICC(STK_AIL), MIXSRC_Ele, true);