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

Merge branch 'master' into km-on-arm-timer

Browse source
This commit is contained in:
krzysztofmatula 2019-04-16 22:19:40 +02:00 • committed by GitHub
commit 135a34a652
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 688 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1049,6 +1049,18 @@ OSD.constants = {
MAX_FFT: {
name: 'MAX_FFT',
desc: 'osdDescStatMaxFFT'
},
TOTAL_FLIGHTS: {
name: 'TOTAL_FLIGHTS',
desc: 'osdDescStatTotalFlights'
},
TOTAL_FLIGHT_TIME: {
name: 'TOTAL_FLIGHT_TIME',
desc: 'osdDescStatTotalFlightTime'
},
TOTAL_FLIGHT_DIST: {
name: 'TOTAL_FLIGHT_DIST',
desc: 'osdDescStatTotalFlightDistance'
}
},
ALL_WARNINGS: {
@ -1103,8 +1115,15 @@ OSD.constants = {
GPS_RESCUE_DISABLED: {
name: 'GPS_RESCUE_DISABLED',
desc: 'osdWarningGpsRescueDisabled'
}
},
RSSI: {
name: 'RSSI',
desc: 'osdWarningRSSI'
},
LINK_QUALITY: {
name: 'LINK_QUALITY',
desc: 'osdWarningLinkQuality'
},
},
FONT_TYPES: [
{ file: "default", name: "Default" },
@ -1333,6 +1352,13 @@ OSD.chooseFields = function () {
F.MAX_FFT
]);
}
if (semver.gte(CONFIG.apiVersion, "1.42.0")) {
OSD.constants.STATISTIC_FIELDS = OSD.constants.STATISTIC_FIELDS.concat([
F.TOTAL_FLIGHTS,
F.TOTAL_FLIGHT_TIME,
F.TOTAL_FLIGHT_DIST
]);
}
}
// Choose warnings
@ -1371,6 +1397,10 @@ OSD.chooseFields = function () {
OSD.constants.TIMER_TYPES = OSD.constants.TIMER_TYPES.concat([
'ON/ARM TIME'
]);
OSD.constants.WARNINGS = OSD.constants.WARNINGS.concat([
F.RSSI,
F.LINK_QUALITY
]);
}
};