sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add feedforward to OSD PID element preview 

Also change the element preview to use the default PIDs for the firmware version (as defined in the Configurator) so that the display is more representative of the actual values (and not display 20 for D on yaw!).
10.8-maintenance
Bruce Luckcuck 2020-10-07 10:33:43 -04:00
parent 2f37546593
commit ed292a9649
1 changed files with 16 additions and 3 deletions
Show Stats 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;
};
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() {
// 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
draw_order: 170,
positionable: true,
preview: 'ROL 43 40 20',
preview: `ROL ${OSD.formatPidsPreview(0)}`,
},
PID_PITCH: {
name: 'PID_PITCH',
@ -754,7 +767,7 @@ OSD.loadDisplayFields = function() {
defaultPosition: 0x800 | (11 << 5) | 2, // 0x0800 | (y << 5) | x
draw_order: 180,
positionable: true,
preview: 'PIT 58 50 22',
preview: `PIT ${OSD.formatPidsPreview(1)}`,
},
PID_YAW: {
name: 'PID_YAW',
@ -763,7 +776,7 @@ OSD.loadDisplayFields = function() {
defaultPosition: 0x800 | (12 << 5) | 2, // 0x0800 | (y << 5) | x
draw_order: 190,
positionable: true,
preview: 'YAW 70 45 20',
preview: `YAW ${OSD.formatPidsPreview(2)}`,
},
POWER: {
name: 'POWER',