From 6c47496e12a99f7b037ba157316c55b73228eeac Mon Sep 17 00:00:00 2001 From: Krzysztof Matula Date: Sun, 14 Apr 2019 17:20:02 +0200 Subject: [PATCH] OSD: combined ON/ARM timer --- src/js/tabs/osd.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/js/tabs/osd.js b/src/js/tabs/osd.js index 483929eb..14b418d8 100644 --- a/src/js/tabs/osd.js +++ b/src/js/tabs/osd.js @@ -272,6 +272,7 @@ OSD.generateTimerPreview = function (osd_data, timer_index) { var preview = ''; switch (osd_data.timers[timer_index].src) { case 0: + case 3: preview += FONT.symbol(SYM.ON_M); break; case 1: @@ -380,11 +381,6 @@ OSD.constants = { 'IMPERIAL', 'METRIC' ], - TIMER_TYPES: [ - 'ON TIME', - 'TOTAL ARMED TIME', - 'LAST ARMED TIME' - ], TIMER_PRECISION: [ 'SECOND', 'HUNDREDTH' @@ -1365,6 +1361,17 @@ OSD.chooseFields = function () { F.GPS_RESCUE_DISABLED ]); } + + OSD.constants.TIMER_TYPES = [ + 'ON TIME', + 'TOTAL ARMED TIME', + 'LAST ARMED TIME' + ]; + if (semver.gte(CONFIG.apiVersion, "1.42.0")) { + OSD.constants.TIMER_TYPES = OSD.constants.TIMER_TYPES.concat([ + 'ON/ARM TIME' + ]); + } }; OSD.updateDisplaySize = function () {