Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-23 00:05:22 +03:00
Code Issues Wiki Activity

Merge pull request #1381 from krzysztofmatula/km-on-arm-timer

Browse source 
OSD: combined ON/ARM timer
This commit is contained in:
Michael Keller 2019-04-19 13:39:25 +12:00 • committed by GitHub
commit 2305e15e4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/js/tabs/osd.js
View file

@ -272,6 +272,7 @@ OSD.generateTimerPreview = function (osd_data, timer_index) {
var preview = ''; var preview = '';
switch (osd_data.timers[timer_index].src) { switch (osd_data.timers[timer_index].src) {
case 0: case 0:
case 3:
preview += FONT.symbol(SYM.ON_M); preview += FONT.symbol(SYM.ON_M);
break; break;
case 1: case 1:
@ -380,11 +381,6 @@ OSD.constants = {
'IMPERIAL', 'IMPERIAL',
'METRIC' 'METRIC'
], ],
TIMER_TYPES: [
'ON TIME',
'TOTAL ARMED TIME',
'LAST ARMED TIME'
],
TIMER_PRECISION: [ TIMER_PRECISION: [
'SECOND', 'SECOND',
'HUNDREDTH' 'HUNDREDTH'
@ -1391,7 +1387,16 @@ OSD.chooseFields = function () {
F.GPS_RESCUE_DISABLED F.GPS_RESCUE_DISABLED
]); ]);
} }
OSD.constants.TIMER_TYPES = [
'ON TIME',
'TOTAL ARMED TIME',
'LAST ARMED TIME'
];
if (semver.gte(CONFIG.apiVersion, "1.42.0")) { if (semver.gte(CONFIG.apiVersion, "1.42.0")) {
OSD.constants.TIMER_TYPES = OSD.constants.TIMER_TYPES.concat([
'ON/ARM TIME'
]);
OSD.constants.WARNINGS = OSD.constants.WARNINGS.concat([ OSD.constants.WARNINGS = OSD.constants.WARNINGS.concat([
F.RSSI, F.RSSI,
F.LINK_QUALITY F.LINK_QUALITY