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

Merge pull request #2208 from etracer65/update_osd_pid_element_preview

Browse source
This commit is contained in:
Michael Keller 2020-10-11 14:50:09 +13:00 • committed by GitHub
commit b6d90c1a8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -434,6 +434,19 @@ OSD.drawCameraFramePreview = function() {
return cameraFrame; return cameraFrame;
}; };
OSD.formatPidsPreview = function(axis) {
const pidDefaults = FC.getPidDefaults();
const p = pidDefaults[axis * 5].toString().padStart(3);
const i = pidDefaults[axis * 5 + 1].toString().padStart(3);
const d = pidDefaults[axis * 5 + 2].toString().padStart(3);
const f = pidDefaults[axis * 5 + 4].toString().padStart(3);
if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
return `${p} ${i} ${d}`;
} else {
return `${p} ${i} ${d} ${f}`;
}
};
OSD.loadDisplayFields = function() { OSD.loadDisplayFields = function() {
// All display fields, from every version, do not remove elements, only add! // All display fields, from every version, do not remove elements, only add!
@ -745,7 +758,7 @@ OSD.loadDisplayFields = function() {
defaultPosition: 0x800 | (10 << 5) | 2, // 0x0800 | (y << 5) | x defaultPosition: 0x800 | (10 << 5) | 2, // 0x0800 | (y << 5) | x
draw_order: 170, draw_order: 170,
positionable: true, positionable: true,
preview: 'ROL 43 40 20', preview: `ROL ${OSD.formatPidsPreview(0)}`,
}, },
PID_PITCH: { PID_PITCH: {
name: 'PID_PITCH', name: 'PID_PITCH',
@ -754,7 +767,7 @@ OSD.loadDisplayFields = function() {
defaultPosition: 0x800 | (11 << 5) | 2, // 0x0800 | (y << 5) | x defaultPosition: 0x800 | (11 << 5) | 2, // 0x0800 | (y << 5) | x
draw_order: 180, draw_order: 180,
positionable: true, positionable: true,
preview: 'PIT 58 50 22', preview: `PIT ${OSD.formatPidsPreview(1)}`,
}, },
PID_YAW: { PID_YAW: {
name: 'PID_YAW', name: 'PID_YAW',
@ -763,7 +776,7 @@ OSD.loadDisplayFields = function() {
defaultPosition: 0x800 | (12 << 5) | 2, // 0x0800 | (y << 5) | x defaultPosition: 0x800 | (12 << 5) | 2, // 0x0800 | (y << 5) | x
draw_order: 190, draw_order: 190,
positionable: true, positionable: true,
preview: 'YAW 70 45 20', preview: `YAW ${OSD.formatPidsPreview(2)}`,
}, },
POWER: { POWER: {
name: 'POWER', name: 'POWER',