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

Merge pull request #1017 from etracer65/osd_stats_reorder

Browse source 
Reorder OSD stats selections to match on-screen display order
This commit is contained in:
Michael Keller 2018-05-12 12:00:11 +12:00 • committed by GitHub
commit cf6d8bf706
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -835,7 +835,7 @@ OSD.constants = {
desc: 'osdDescStatRtcDateTime' desc: 'osdDescStatRtcDateTime'
}, },
STAT_BATTERY: { STAT_BATTERY: {
name: 'STAT_BATTERY', name: 'BATTERY_VOLTAGE',
desc: 'osdDescStatBattery' desc: 'osdDescStatBattery'
} }
}, },
@ -1002,32 +1002,55 @@ OSD.chooseFields = function () {
]; ];
} }
// Choose ststistic fields // Choose statistic fields
// Nothing much to do here, I'm preempting there being new statistics // Nothing much to do here, I'm preempting there being new statistics
F = OSD.constants.ALL_STATISTIC_FIELDS; F = OSD.constants.ALL_STATISTIC_FIELDS;
OSD.constants.STATISTIC_FIELDS = [
F.MAX_SPEED, // ** IMPORTANT **
F.MIN_BATTERY, //
F.MIN_RSSI, // Starting with 1.39.0 (Betaflight 3.4) the OSD stats selection options
F.MAX_CURRENT, // are ordered in the same sequence as displayed on-screen in the OSD.
F.USED_MAH, // If future versions of the firmware implement changes to the on-screen ordering,
F.MAX_ALTITUDE, // that needs to be implemented here as well. Simply appending new stats does not
F.BLACKBOX, // require a completely new section for the version - only reordering.
F.END_BATTERY,
F.TIMER_1, if (semver.lt(CONFIG.apiVersion, "1.39.0")) {
F.TIMER_2, OSD.constants.STATISTIC_FIELDS = [
F.MAX_DISTANCE, F.MAX_SPEED,
F.BLACKBOX_LOG_NUMBER F.MIN_BATTERY,
]; F.MIN_RSSI,
if (semver.gte(CONFIG.apiVersion, "1.37.0")) { F.MAX_CURRENT,
OSD.constants.STATISTIC_FIELDS = OSD.constants.STATISTIC_FIELDS.concat([ F.USED_MAH,
F.RTC_DATE_TIME F.MAX_ALTITUDE,
]); F.BLACKBOX,
if (semver.gte(CONFIG.apiVersion, "1.39.0")) { F.END_BATTERY,
OSD.constants.STATISTIC_FIELDS = OSD.constants.STATISTIC_FIELDS.concat([ F.TIMER_1,
F.STAT_BATTERY F.TIMER_2,
]); F.MAX_DISTANCE,
F.BLACKBOX_LOG_NUMBER
];
if (semver.gte(CONFIG.apiVersion, "1.37.0")) {
OSD.constants.STATISTIC_FIELDS = OSD.constants.STATISTIC_FIELDS.concat([
F.RTC_DATE_TIME
]);
} }
} else { // Starting with 1.39.0 OSD stats are reordered to match how they're presented on screen
OSD.constants.STATISTIC_FIELDS = [
F.RTC_DATE_TIME,
F.TIMER_1,
F.TIMER_2,
F.MAX_SPEED,
F.MAX_DISTANCE,
F.MIN_BATTERY,
F.END_BATTERY,
F.STAT_BATTERY,
F.MIN_RSSI,
F.MAX_CURRENT,
F.USED_MAH,
F.MAX_ALTITUDE,
F.BLACKBOX,
F.BLACKBOX_LOG_NUMBER
];
} }
// Choose warnings // Choose warnings