Timers in Custom Telemetry View

2012-03-17 08:16:49 +00:00
parent 31a5104730
commit 5961611dfe
2 changed files with 8 additions and 4 deletions
@@ -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
@@ -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);
+            }
          }
        }
      }