From ae1be246b6b1df8c4b67dd51a66d11e698c33171 Mon Sep 17 00:00:00 2001
From: "bsongis@gmail.com"
 <bsongis@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Mon, 15 Apr 2013 13:48:58 +0000
Subject: [PATCH] [all] d>=ofs and Timers were not working with EXT=STD

---
 src/menu_model.cpp | 12 ++++++------
 src/opentx.cpp     |  7 +++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/menu_model.cpp b/src/menu_model.cpp
index bd99e539d..3ca7e7e5f 100644
--- a/src/menu_model.cpp
+++ b/src/menu_model.cpp
@@ -3586,14 +3586,10 @@ void menuModelCustomSwitches(uint8_t event)
       }
       else {
         putsMixerSource(CSW_2ND_COLUMN, y, cs->v1, 0);
-
-#if defined(FRSKY)
         if (cs->v1 >= MIXSRC_FIRST_TELEM) {
           putsTelemetryChannel(CSW_3RD_COLUMN, y, cs->v1 - MIXSRC_FIRST_TELEM, convertCswTelemValue(cs), LEFT);
         }
-        else
-#endif
-        {
+        else {
           lcd_outdezAtt(CSW_3RD_COLUMN, y, cs->v2, LEFT);
         }
       }
@@ -3685,7 +3681,11 @@ void menuModelCustomSwitches(uint8_t event)
         v2_min = -125; v2_max = 125;
       }
 #else
-      {
+      if (cs->v1 >= MIXSRC_FIRST_TELEM) {
+        putsTime(CSW_3RD_COLUMN, y, (int16_t)3 * (CS_STATE(cs->func)==CS_VOFS ? 128+cs->v2 : cs->v2), LEFT | (m_posHorz==2 ? attr : 0), LEFT | (m_posHorz==2 ? attr : 0));
+        v2_min = -128; v2_max = 127;
+      }
+      else {
         lcd_outdezAtt(CSW_3RD_COLUMN, y, cs->v2, LEFT | (m_posHorz==2 ? attr : 0));
         v2_min = -125; v2_max = 125;
       }
diff --git a/src/opentx.cpp b/src/opentx.cpp
index 4433600af..a1bdef372 100644
--- a/src/opentx.cpp
+++ b/src/opentx.cpp
@@ -1039,8 +1039,11 @@ bool __getSwitch(int8_t swtch)
             y = calc100toRESX(cs->v2);
           }
 #else
-          if (cs->v1 >= MIXSRC_GVAR1) {
-            y = cs->v2; // it's a GVAR or a Timer
+          if (cs->v1 >= MIXSRC_FIRST_TELEM) {
+            y = (int16_t)3 * cs->v2; // it's a Timer
+          }
+          else if (cs->v1 >= MIXSRC_GVAR1) {
+            y = cs->v2; // it's a GVAR
           }
           else {
             y = calc100toRESX(cs->v2);