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

Merge pull request #2974 from jonmahoney15/watt-hours-consumed-osd-element

Browse source 
Watt Hours Consumed OSD element and post Flight Stat
This commit is contained in:
haslinghuis 2022-09-29 12:42:53 +02:00 • committed by GitHub
commit 500dea5b14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -742,6 +742,15 @@ OSD.loadDisplayFields = function() {
return semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36) ? ` 690${FONT.symbol(SYM.MAH)}` : `${FONT.symbol(SYM.MAH)}690`;
},
},
WH_DRAWN: {
name: 'WH_DRAWN',
text: 'osdTextElementWhDrawn',
desc: 'osdDescElementWhDrawn',
defaultPosition: -1,
draw_order: 145,
positionable: true,
preview: '1.10 WH',
},
CRAFT_NAME: {
name: 'CRAFT_NAME',
text: 'osdTextElementCraftName',
@ -1373,6 +1382,11 @@ OSD.constants = {
text: 'osdTextStatUsedMah',
desc: 'osdDescStatUsedMah',
},
USED_WH: {
name: 'USED_WH',
text: 'osdTextStatUsedWh',
desc: 'osdDescStatUsedWh',
},
MAX_ALTITUDE: {
name: 'MAX_ALTITUDE',
text: 'osdTextStatMaxAltitude',
@ -1645,6 +1659,7 @@ OSD.chooseFields = function() {
F.VTX_CHANNEL,
F.CURRENT_DRAW,
F.MAH_DRAWN,
F.WH_DRAWN,
F.GPS_SPEED,
F.GPS_SATS,
F.ALTITUDE,
@ -1812,6 +1827,7 @@ OSD.chooseFields = function() {
F.MAX_ALTITUDE,
F.BLACKBOX,
F.BLACKBOX_LOG_NUMBER,
F.USED_WH,
];
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
OSD.constants.STATISTIC_FIELDS = OSD.constants.STATISTIC_FIELDS.concat([