From 5961611dfeb7a125cf3d63568c02902617f50098 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Sat, 17 Mar 2012 08:16:49 +0000
Subject: [PATCH] Timers in Custom Telemetry View

---
 TODO.txt      |  1 -
 src/frsky.cpp | 11 ++++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index 69eaff1a0..d447688e9 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,5 +4,4 @@ TODO list (no particular order)
 - Optimization for extra dblsize chars (se: 16 used when 6 needed)
 - DSM2 channel order (Cam)
 - Variometer (rate as cm/sec)
-- Telemetry value averaging
 - Trace telemetry data
diff --git a/src/frsky.cpp b/src/frsky.cpp
index 79eaad289..15869eacb 100644
--- a/src/frsky.cpp
+++ b/src/frsky.cpp
@@ -899,9 +899,14 @@ void menuProcFrsky(uint8_t event)
             }
           }
           if (field) {
-            int16_t value = getValue(CSW_CHOUT_BASE+NUM_CHNOUT+MAX_TIMERS+field-1);
-            putsTelemetryChannel(j ? 128 : 63, i==3 ? 1+7*FH : 1+2*FH+2*FH*i, field-1, value, i==3 ? NO_UNIT : DBLSIZE|NO_UNIT);
-            lcd_putsiAtt(j*65, 1+FH+2*FH*i, STR_VTELEMCHNS, field, 0);
+            if (field >= TELEM_TM1) {
+              putsTime(j?74:10, 1+FH+2*FH*i, s_timerVal[field-TELEM_TM1], DBLSIZE, DBLSIZE);
+            }
+            else {
+              int16_t value = getValue(CSW_CHOUT_BASE+NUM_CHNOUT+MAX_TIMERS+field-1);
+              putsTelemetryChannel(j ? 128 : 63, i==3 ? 1+7*FH : 1+2*FH+2*FH*i, field-1, value, i==3 ? NO_UNIT : DBLSIZE|NO_UNIT);
+              lcd_putsiAtt(j*65, 1+FH+2*FH*i, STR_VTELEMCHNS, field, 0);
+            }
           }
         }
       }