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

Add aux value element

Browse source
This commit is contained in:
Mark Haslinghuis 2022-10-23 02:06:20 +02:00
parent ce90b0faa7
commit 98e698b39a
2 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
locales/en/messages.json
View file

@ -4980,6 +4980,14 @@
"osdDescElementWhDrawn": { "osdDescElementWhDrawn": {
"message": "Total battery capacity used in Wh" "message": "Total battery capacity used in Wh"
}, },
"osdDescElementAuxValue": {
"message": "Aux value",
"description": "Displays a receiver AUX channel see PR 10789"
},
"osdTextElementAuxValue": {
"message": "Aux value",
"description": "One of the elements of the OSD"
},
"osdTextElementCraftName": { "osdTextElementCraftName": {
"message": "Craft name", "message": "Craft name",
"description": "One of the elements of the OSD" "description": "One of the elements of the OSD"

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

@ -742,15 +742,6 @@ OSD.loadDisplayFields = function() {
return semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36) ? ` 690${FONT.symbol(SYM.MAH)}` : `${FONT.symbol(SYM.MAH)}690`; 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: { CRAFT_NAME: {
name: 'CRAFT_NAME', name: 'CRAFT_NAME',
text: 'osdTextElementCraftName', text: 'osdTextElementCraftName',
@ -1325,6 +1316,24 @@ OSD.loadDisplayFields = function() {
positionable: true, positionable: true,
preview: `${FONT.symbol(SYM.RSSI)}250MW`, preview: `${FONT.symbol(SYM.RSSI)}250MW`,
}, },
WH_DRAWN: {
name: 'WH_DRAWN',
text: 'osdTextElementWhDrawn',
desc: 'osdDescElementWhDrawn',
defaultPosition: -1,
draw_order: 475,
positionable: true,
preview: '1.10 WH',
},
AUX_VALUE: {
name: 'AUX_VALUE',
text: 'osdTextElementAuxValue',
desc: 'osdDescElementAuxValue',
defaultPosition: -1,
draw_order: 480,
positionable: true,
preview: 'AUX',
},
}; };
}; };
@ -1758,6 +1767,7 @@ OSD.chooseFields = function() {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) { if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
OSD.constants.DISPLAY_FIELDS = OSD.constants.DISPLAY_FIELDS.concat([ OSD.constants.DISPLAY_FIELDS = OSD.constants.DISPLAY_FIELDS.concat([
F.WH_DRAWN, F.WH_DRAWN,
F.AUX_VALUE,
F.READY_MODE, F.READY_MODE,
]); ]);
} }