Skip to content

Progressive settings loading - OSD tab loads much faster #2466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sensei-hacker merged 5 commits into from
Dec 12, 2025
Merged

Progressive settings loading - OSD tab loads much faster #2466

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
66b6d82
Progressive settings loading for faster tab rendering
sensei-hacker Dec 8, 2025
a1c2145
Add null check for customElementItems array
sensei-hacker Dec 8, 2025
ec6cc6b
Pass settings promise to callback for optional await
sensei-hacker Dec 8, 2025
159806a
Fix OSD tab race conditions with async data loading
sensei-hacker Dec 9, 2025
2df96a9
Make optimized logic condition loading compatible with earler 9.0-RX*…
sensei-hacker Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions js/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ var Settings = (function () {
}
}

// If data is defined, We want to convert this value into
// If data is defined, We want to convert this value into
// something matching the units
self.convertToUnitSetting(input, inputUnit);

Expand All @@ -164,7 +164,6 @@ var Settings = (function () {
});
};


/**
*
* @param {JQuery Element} input
Expand Down Expand Up @@ -647,8 +646,11 @@ var Settings = (function () {

self.processHtml = function(callback) {
return function() {
self.configureInputs().then(callback);
// Start loading settings in background - don't block rendering
self.configureInputs();
self.linkHelpIcons();
// Call callback immediately so page can start rendering
callback();
};
};

Expand Down
4 changes: 2 additions & 2 deletions js/settingsCache.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ var settingsCache = (function() {

publicScope.get = function(settingName) {
let settings = store.get(SETTINGS_KEY, null);

if (settings === null) {
return undefined;
}
let setting = settings[privateScope.getSetingKey(settingName)];
const key = privateScope.getSetingKey(settingName);
let setting = settings[key];
return setting;
};

Expand Down
21 changes: 21 additions & 0 deletions tabs/osd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3203,6 +3203,10 @@ OSD.GUI.updateMapPreview = function(mapCenter, name, directionSymbol, centerSymb
};

OSD.GUI.updatePreviews = function() {
// Guard against being called before OSD data is loaded
if (!OSD.data) {
return;
}
// buffer the preview;
OSD.data.preview = [];

Expand Down Expand Up @@ -3479,6 +3483,7 @@ OSD.GUI.updateAll = function() {
OSD.GUI.updateVideoMode();
OSD.GUI.updateUnits();
OSD.GUI.updateFields();
updatePilotAndCraftNames();
OSD.GUI.updatePreviews();
OSD.GUI.updateGuidesView($('#videoGuides').find('input').is(':checked'));
OSD.GUI.updateDjiView(HARDWARE.capabilities.isDjiHdFpv && !HARDWARE.capabilities.isMspDisplay);
Expand Down Expand Up @@ -3952,7 +3957,14 @@ function updateOSDCustomElementsDisplay() {

function fillCustomElementsValues() {
for (var i = 0; i < FC.OSD_CUSTOM_ELEMENTS.settings.customElementsCount; i++) {
// Safety check - items may not be loaded yet
if (!FC.OSD_CUSTOM_ELEMENTS.items[i]) {
continue;
}
for (var ii = 0; ii < FC.OSD_CUSTOM_ELEMENTS.settings.customElementParts; ii++) {
if (!FC.OSD_CUSTOM_ELEMENTS.items[i].customElementItems[ii]) {
continue;
}
$('.osdCustomElement-' + i + '-part-' + ii + '-type').val(FC.OSD_CUSTOM_ELEMENTS.items[i].customElementItems[ii].type).trigger('change');

var valueCell = $('.osdCustomElement-' + i + '-part-' + ii + '-value');
Expand Down Expand Up @@ -4200,13 +4212,22 @@ function refreshOSDSwitchIndicators() {
}

function updatePilotAndCraftNames() {
// Guard against being called before OSD constants are initialized
if (!OSD.constants || !OSD.constants.ALL_DISPLAY_GROUPS) {
return;
}

let foundPilotName = ($('#pilot_name').val() == undefined);
let foundCraftName = ($('#craft_name').val() == undefined);

let generalGroup = OSD.constants.ALL_DISPLAY_GROUPS.filter(function(e) {
return e.name == "osdGroupGeneral";
})[0];

if (!generalGroup || !generalGroup.items) {
return;
}

if (($('#craft_name').val() != undefined) || ($('#pilot_name').val() != undefined)) {
for (let si = 0; si < generalGroup.items.length; si++) {
if (generalGroup.items[si].name == "CRAFT_NAME") {
Expand Down